diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt
index 93a3151fe5..feeff91abb 100644
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -53,11 +53,6 @@ add_library(Spreadsheet SHARED ${Spreadsheet_SRCS})
 target_link_libraries(Spreadsheet ${Spreadsheet_LIBS})
 
 
-fc_target_copy_resource(Spreadsheet 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Spreadsheet
-    ${CMAKE_BINARY_DIR}/Mod/Spreadsheet
-    Init.py TestSpreadsheet.py importXLSX.py)
-
 SET_BIN_DIR(Spreadsheet Spreadsheet /Mod/Spreadsheet)
 SET_PYTHON_PREFIX_SUFFIX(Spreadsheet)
 
diff --git a/src/Mod/Spreadsheet/CMakeLists.txt b/src/Mod/Spreadsheet/CMakeLists.txt
index d161246fb1..42dea69cc3 100644
--- a/src/Mod/Spreadsheet/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/CMakeLists.txt
@@ -4,12 +4,29 @@ if(BUILD_GUI)
     add_subdirectory(Gui)
 endif(BUILD_GUI)
 
-INSTALL(
+set(Spreadsheet_Scripts
+    Init.py
+    TestSpreadsheet.py
+    importXLSX.py
+)
+
+if(BUILD_GUI)
+    list (APPEND Spreadsheet_Scripts InitGui.py)
+endif(BUILD_GUI)
+
+add_custom_target(SpreadsheetScripts ALL
+    SOURCES ${Spreadsheet_Scripts}
+)
+
+fc_target_copy_resource(SpreadsheetScripts
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Spreadsheet
+    ${Spreadsheet_Scripts}
+)
+
+install(
     FILES
-        Init.py
-        InitGui.py
-        TestSpreadsheet.py
-        importXLSX.py
+        ${Spreadsheet_Scripts}
     DESTINATION
         Mod/Spreadsheet
 )
diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
index 1e5c70445f..5c6b85620b 100644
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -90,23 +90,17 @@ SET(SpreadsheetGui_SRCS
     ${SpreadsheetGui_UIC_HDRS}
 )
 
-add_library(SpreadsheetGui SHARED ${SpreadsheetGui_SRCS})
-target_link_libraries(SpreadsheetGui ${SpreadsheetGui_LIBS})
-
-fc_target_copy_resource(SpreadsheetGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Spreadsheet
-    ${CMAKE_BINARY_DIR}/Mod/Spreadsheet
-    InitGui.py)
-
-SET_BIN_DIR(SpreadsheetGui SpreadsheetGui /Mod/Spreadsheet)
-SET_PYTHON_PREFIX_SUFFIX(SpreadsheetGui)
-
-INSTALL(TARGETS SpreadsheetGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
 SET(SpreadsheetGuiIcon_SVG
     Resources/icons/SpreadsheetWorkbench.svg
 )
 
+add_library(SpreadsheetGui SHARED ${SpreadsheetGui_SRCS} ${SpreadsheetGuiIcon_SVG})
+target_link_libraries(SpreadsheetGui ${SpreadsheetGui_LIBS})
+
+SET_BIN_DIR(SpreadsheetGui SpreadsheetGui /Mod/Spreadsheet)
+SET_PYTHON_PREFIX_SUFFIX(SpreadsheetGui)
+
 fc_copy_sources(SpreadsheetGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Spreadsheet" ${SpreadsheetGuiIcon_SVG})
 
+INSTALL(TARGETS SpreadsheetGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL(FILES ${SpreadsheetGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Spreadsheet/Resources/icons")