diff --git a/CMakeLists.txt b/CMakeLists.txt
index 990d2684..e4050a86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,14 +352,16 @@ if (CONF_DOXYGEN)
 
 endif()
 
-configure_file (src/setup/win32/Include.wxi.in
-				"${CMAKE_BINARY_DIR}/setup/Include.wxi" NEWLINE_STYLE WIN32)
+if (WIN32)
+	configure_file (dist/wix/Include.wxi.in
+					"${CMAKE_BINARY_DIR}/dist/wix/Include.wxi" NEWLINE_STYLE WIN32)
 
-configure_file (src/setup/win32/Product.wxs
-				"${CMAKE_BINARY_DIR}/setup/Product.wxs" COPYONLY)
+	configure_file (dist/wix/Product.wxs
+					"${CMAKE_BINARY_DIR}/dist/wix/Product.wxs" COPYONLY)
 
-configure_file (src/setup/win32/Synergy.wixproj
-				"${CMAKE_BINARY_DIR}/setup/Synergy.wixproj" COPYONLY)
+	configure_file (dist/wix/Synergy.wixproj
+					"${CMAKE_BINARY_DIR}/dist/wix/Synergy.wixproj" COPYONLY)
+endif()
 
 option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
 
diff --git a/src/setup/win32/Include.wxi.in b/dist/wix/Include.wxi.in
similarity index 100%
rename from src/setup/win32/Include.wxi.in
rename to dist/wix/Include.wxi.in
diff --git a/src/setup/win32/Product.wxs b/dist/wix/Product.wxs
similarity index 100%
rename from src/setup/win32/Product.wxs
rename to dist/wix/Product.wxs
diff --git a/src/setup/win32/Synergy.sln b/dist/wix/Synergy.sln
similarity index 100%
rename from src/setup/win32/Synergy.sln
rename to dist/wix/Synergy.sln
diff --git a/src/setup/win32/Synergy.wixproj b/dist/wix/Synergy.wixproj
similarity index 100%
rename from src/setup/win32/Synergy.wixproj
rename to dist/wix/Synergy.wixproj