diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee10aba1e..0191b110a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -401,7 +401,13 @@ if (WIN32)
 	# our stuff
 	set(CPACK_COMPONENT_ALETHZERO_GROUP "Applications")
 	set(CPACK_COMPONENT_MIX_GROUP "Applications")
-	set(CPACK_COMPONENTS_ALL alethzero mix)
+	set(CPACK_COMPONENT_SOLC_GROUP "CLI")
+	set(CPACK_COMPONENT_ETH_GROUP "CLI")
+	set(CPACK_COMPONENT_ETHMINER_GROUP "CLI")
+	set(CPACK_COMPONENT_RLP_GROUP "CLI")
+	set(CPACK_COMPONENT_ABI_GROUP "CLI")
+
+	set(CPACK_COMPONENTS_ALL alethzero mix solc eth ethminer rlp abi)
 
 	# nsis specific stuff
 	set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ethereum")
diff --git a/abi/CMakeLists.txt b/abi/CMakeLists.txt
index 82c7c4240..47c581b5b 100644
--- a/abi/CMakeLists.txt
+++ b/abi/CMakeLists.txt
@@ -12,5 +12,4 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} ethereum)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin) 
-
+eth_install_executable(${EXECUTABLE})
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index 962d55373..06c0c9989 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -37,5 +37,4 @@ if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
 	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
-
+eth_install_executable(${EXECUTABLE})
diff --git a/ethminer/CMakeLists.txt b/ethminer/CMakeLists.txt
index cd8919bb2..7467578fc 100644
--- a/ethminer/CMakeLists.txt
+++ b/ethminer/CMakeLists.txt
@@ -37,5 +37,4 @@ if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
 	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
-
+eth_install_executable(${EXECUTABLE})
diff --git a/rlp/CMakeLists.txt b/rlp/CMakeLists.txt
index 0e2b5f57b..247804dbc 100644
--- a/rlp/CMakeLists.txt
+++ b/rlp/CMakeLists.txt
@@ -12,5 +12,4 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} devcrypto)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin) 
-
+eth_install_executable(${EXECUTABLE})
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index c8e74ed71..14e95a4e7 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
 target_link_libraries(${EXECUTABLE} solidity)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
+eth_install_executable(${EXECUTABLE})
 
 add_library(soljson jsonCompiler.cpp ${HEADERS})
 target_link_libraries(soljson solidity)