diff --git a/cmake/CMakeLists_cpack.txt b/cmake/CMakeLists_cpack.txt
index 65cca8c8..2d82c978 100644
--- a/cmake/CMakeLists_cpack.txt
+++ b/cmake/CMakeLists_cpack.txt
@@ -16,19 +16,18 @@
 # List of CPack variables:
 # http://www.vtk.org/Wiki/CMake:CPackConfiguration
 
-# CPack files common to all platforms.
-SET(cpack_targets synergys synergyc)
+if(WIN32)
+	
+	install(TARGETS
+		synergys
+		synergyc
+		synrgyhk
+		COMPONENT core
+		DESTINATION bin)
 
-IF(WIN32)
-	# Windows has an extra GUI and DLL.
-	LIST(APPEND cpack_targets launcher synrgyhk)
-ENDIF(WIN32)
-
-INSTALL(
-	TARGETS ${cpack_targets}
-	RUNTIME DESTINATION bin)
-
-IF(WIN32)
+	set(CPACK_COMPONENT_CORE_REQUIRED true)
+	set(CPACK_COMPONENT_CORE_DISPLAY_NAME "Server and Client")
+	
 	INSTALL(
 		FILES
 		bin/Release/qsynergy.exe
@@ -37,10 +36,10 @@ IF(WIN32)
 		${QT_DIR}/qt/bin/QtGui4.dll
 		${QT_DIR}/qt/bin/QtCore4.dll
 		${QT_DIR}/qt/bin/QtNetwork4.dll
-		COMPONENT qsynergy
+		COMPONENT gui
 		DESTINATION bin)
 
-	set(CPACK_COMPONENT_QSYNERGY_DISPLAY_NAME "Graphical User Interface")
+	set(CPACK_COMPONENT_GUI_DISPLAY_NAME "Graphical User Interface")
 	
 	set(VCREDIST_PATH "${VCREDIST_DIR}/${VCREDIST_FILE}")
 	
@@ -50,12 +49,13 @@ IF(WIN32)
 		COMPONENT vcredist
 		DESTINATION redist)
 	
-	set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual C++ 2008 Redistributable")
+	set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual C++ Redistributable")
 
 	set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
 	  ExecWait '\\\"$INSTDIR\\\\redist\\\\${VCREDIST_FILE}\\\" /install /q'")
 
-ELSE(WIN32)
+else()
+
 	IF(APPLE)
 		# TODO: how the hell do we distribute mac apps?
 		#INSTALL(
@@ -68,7 +68,8 @@ ELSE(WIN32)
 			bin/qsynergy
 			DESTINATION bin)
 	ENDIF(APPLE)
-ENDIF(WIN32)
+
+endif()
 
 # The default CPack behaviour is not to append the system processor
 # type, which is undesirable in our case, since we want to support 
@@ -114,11 +115,14 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${cmake_dir}/License.rtf")
 SET(CPACK_RESOURCE_FILE_README "${cmake_dir}/Readme.txt")
 
 IF(WIN32)
-	SET(WIN32_ICON "${root_dir}/cmd/launcher/synergy.ico")
+	SET(WIN32_ICON "${root_dir}/gui/res/win/QSynergy.ico")
+	set(CPACK_NSIS_URL_INFO_ABOUT "http://synergy-foss.org")
+	set(CPACK_NSIS_HELP_LINK "http://synergy-foss.org/support")
 	SET(CPACK_NSIS_MUI_ICON ${WIN32_ICON})
 	SET(CPACK_NSIS_MUI_UNIICON ${WIN32_ICON})
-	SET(CPACK_NSIS_INSTALLED_ICON_NAME launcher)
+	SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/qsynergy.exe")
 	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Synergy")
+	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Synergy")	
 	SET(CPACK_PACKAGE_EXECUTABLES qsynergy;Synergy)
 ENDIF(WIN32)