diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 8f9000e36a..ff32631ab6 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -76,4 +76,4 @@ ADD_EXECUTABLE(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVP
 
 TARGET_LINK_LIBRARIES(cvpcb common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
-INSTALL(TARGETS cvpcb RUNTIME DESTINATION ${KICAD_BIN})
+INSTALL(TARGETS cvpcb RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 3ccf5664dc..aa048f61eb 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -123,6 +123,6 @@ ADD_EXECUTABLE(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SR
 
 TARGET_LINK_LIBRARIES(eeschema common ${wxWidgets_LIBRARIES})
 
-INSTALL(TARGETS eeschema RUNTIME DESTINATION ${KICAD_BIN})
+INSTALL(TARGETS eeschema RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
 
 ADD_SUBDIRECTORY(plugins)
diff --git a/eeschema/plugins/CMakeLists.txt b/eeschema/plugins/CMakeLists.txt
index 323902e902..5ba0f69e6a 100644
--- a/eeschema/plugins/CMakeLists.txt
+++ b/eeschema/plugins/CMakeLists.txt
@@ -4,4 +4,4 @@ ENDIF(UNIX)
 
 ADD_EXECUTABLE(netlist_form_pads-pcb netlist_form_pads-pcb.cpp)
 
-INSTALL(TARGETS netlist_form_pads-pcb RUNTIME DESTINATION ${KICAD_PLUGINS})
+INSTALL(TARGETS netlist_form_pads-pcb RUNTIME DESTINATION ${KICAD_PLUGINS} COMPONENT binary)
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 19b73c92c3..45df00d487 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -78,4 +78,4 @@ ADD_EXECUTABLE(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SR
 
 TARGET_LINK_LIBRARIES(gerbview common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
-INSTALL(TARGETS gerbview RUNTIME DESTINATION ${KICAD_BIN})
+INSTALL(TARGETS gerbview RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index a928496437..c917e1af5a 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -1,3 +1,15 @@
-INSTALL(DIRECTORY de en es fr it pt ru
-	DESTINATION ${KICAD_DOCS}
-	PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY de COMPONENT doc-de
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY en COMPONENT doc-den
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY es COMPONENT doc-es
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY fr COMPONENT doc-fr
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY it COMPONENT doc-it
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY pt COMPONENT doc-pt
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY ru COMPONENT doc-ru
+	DESTINATION ${KICAD_DOCS} PATTERN ".svn" EXCLUDE)
+
diff --git a/internat/CMakeLists.txt b/internat/CMakeLists.txt
index 3722c26bd3..271bfa7507 100644
--- a/internat/CMakeLists.txt
+++ b/internat/CMakeLists.txt
@@ -1,3 +1,3 @@
 INSTALL(DIRECTORY ca cs de es fr hu it ko pl pt ru sl
-	DESTINATION ${KICAD_INTERNAT}
+	DESTINATION ${KICAD_INTERNAT} COMPONENT resources
 	PATTERN ".svn" EXCLUDE)
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 116ab644ea..c125f78d16 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -36,7 +36,7 @@ ADD_EXECUTABLE(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KIC
 
 TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES})
 
-INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN})
+INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
 
 IF(BUILD_MINIZIP)
 	ADD_SUBDIRECTORY(minizip)
diff --git a/kicad/minizip/CMakeLists.txt b/kicad/minizip/CMakeLists.txt
index bfce1cb863..241394eb81 100644
--- a/kicad/minizip/CMakeLists.txt
+++ b/kicad/minizip/CMakeLists.txt
@@ -15,4 +15,4 @@ ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
 
 TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})
 
-INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
+INSTALL(TARGETS minizip RUNTIME DESTINATION bin COMPONENT binary)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1b41cd0af3..888b6a1211 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -2,6 +2,6 @@ FILE(GLOB dcm_files "*.dcm")
 FILE(GLOB lib_files "*.lib")
 FILE(GLOB sym_files "*.sym")
 
-INSTALL(FILES ${dcm_files} DESTINATION ${KICAD_LIBRARY})
-INSTALL(FILES ${lib_files} DESTINATION ${KICAD_LIBRARY})
-INSTALL(FILES ${sym_files} DESTINATION ${KICAD_LIBRARY})
+INSTALL(FILES ${dcm_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
+INSTALL(FILES ${lib_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
+INSTALL(FILES ${sym_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 936f5275d9..a09443bc61 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -3,10 +3,10 @@ FILE(GLOB equ_files "*.equ")
 FILE(GLOB mdc_files "*.mdc")
 FILE(GLOB mod_files "*.mod")
 
-INSTALL(FILES ${brd_files} DESTINATION ${KICAD_MODULES})
-INSTALL(FILES ${equ_files} DESTINATION ${KICAD_MODULES})
-INSTALL(FILES ${mdc_files} DESTINATION ${KICAD_MODULES})
-INSTALL(FILES ${mod_files} DESTINATION ${KICAD_MODULES})
+INSTALL(FILES ${brd_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+INSTALL(FILES ${equ_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+INSTALL(FILES ${mdc_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+INSTALL(FILES ${mod_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
 
-INSTALL(DIRECTORY packages3d DESTINATION ${KICAD_MODULES}
+INSTALL(DIRECTORY packages3d DESTINATION ${KICAD_MODULES} COMPONENT resources
 	PATTERN ".svn" EXCLUDE)
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index d1e0ad7bb6..ed572a1bfa 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -177,4 +177,4 @@ TARGET_LINK_LIBRARIES(specctra_test common ${wxWidgets_LIBRARIES})
 
 TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer polygon ${wxWidgets_LIBRARIES})
 
-INSTALL(TARGETS pcbnew RUNTIME DESTINATION ${KICAD_BIN})
+INSTALL(TARGETS pcbnew RUNTIME DESTINATION ${KICAD_BIN} COMPONENT binary)
diff --git a/template/CMakeLists.txt b/template/CMakeLists.txt
index 02a06b4849..f195d18ab9 100644
--- a/template/CMakeLists.txt
+++ b/template/CMakeLists.txt
@@ -1,2 +1,2 @@
 INSTALL(FILES kicad.pro
-	DESTINATION ${KICAD_TEMPLATE})
+	DESTINATION ${KICAD_TEMPLATE} COMPONENT resources)