diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc653ac4..b5e8ff1a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,7 @@ OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3
 OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
 OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
 OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
+OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
 
 # ==============================================================================
 
diff --git a/src/3rdParty/CMakeLists.txt b/src/3rdParty/CMakeLists.txt
index e6de70dba..5309c7a1f 100644
--- a/src/3rdParty/CMakeLists.txt
+++ b/src/3rdParty/CMakeLists.txt
@@ -20,16 +20,18 @@ elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE7X)
 #endif(MINGW)
 # applies for Unix, MinGW and Windows with custom LibPack
 elseif(FREECAD_BUILD_GUI)
-    find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
-    if (COIN_VERSION3)
-    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
-        add_subdirectory(Pivy-0.5)
-    endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
-    else (COIN_VERSION3)
-    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
-        add_subdirectory(Pivy)
-    endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
-    endif(COIN_VERSION3)
+    if (NOT FREECAD_BUILD_DEBIAN)
+        find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
+        if (COIN_VERSION3)
+        if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
+            add_subdirectory(Pivy-0.5)
+        endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
+        else (COIN_VERSION3)
+        if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
+            add_subdirectory(Pivy)
+        endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
+        endif(COIN_VERSION3)
+    endif (NOT FREECAD_BUILD_DEBIAN)
 endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
 
 # For Windows we have all stuff in the LibPack
diff --git a/src/3rdParty/Pivy-0.5/CMakeLists.txt b/src/3rdParty/Pivy-0.5/CMakeLists.txt
index ed5ef5f02..3b71e24a1 100644
--- a/src/3rdParty/Pivy-0.5/CMakeLists.txt
+++ b/src/3rdParty/Pivy-0.5/CMakeLists.txt
@@ -123,4 +123,4 @@ fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
 )
 
 install(TARGETS soqt DESTINATION bin/pivy/gui)
-install(FILES __init__.py soqt.py DESTINATION bin/pivy/gui)
+install(FILES gui/__init__.py soqt.py DESTINATION bin/pivy/gui)
diff --git a/src/3rdParty/Pivy/CMakeLists.txt b/src/3rdParty/Pivy/CMakeLists.txt
index 9ee6ae537..0094e725e 100644
--- a/src/3rdParty/Pivy/CMakeLists.txt
+++ b/src/3rdParty/Pivy/CMakeLists.txt
@@ -123,4 +123,4 @@ fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
 )
 
 install(TARGETS soqt DESTINATION bin/pivy/gui)
-install(FILES __init__.py gui/soqt.py DESTINATION bin/pivy/gui)
+install(FILES gui/__init__.py gui/soqt.py DESTINATION bin/pivy/gui)
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
index 32612ca95..21f91d3ca 100644
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -68,7 +68,7 @@ if(SWIG_FOUND)
     add_definitions(-DHAVE_SWIG=1)
 endif(SWIG_FOUND)
 
-if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
+if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
 SET(zipios_SRCS
     ../zipios++/backbuffer.h
     ../zipios++/basicentry.cpp
@@ -122,12 +122,12 @@ SET(zipios_SRCS
     ../zipios++/zipoutputstream.h
 )
 SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
-else (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
+else (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
     set(FreeCADBase_LIBS
         ${FreeCADBase_LIBS}
         -lzipios
     )
-endif (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
+endif (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
 
 SET(pycxx_SRCS
     ../CXX/Config.hxx