diff --git a/CMakeLists.txt b/CMakeLists.txt
index 544c48f79f6..4078e520a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,6 +331,11 @@ ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)
+
+# Create a single package with "make package"
+# (see http://public.kitware.com/Bug/view.php?id=11452)
+SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
+
 INCLUDE(CPack)
 IF(UNIX)
   INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL)
diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index adc3cf4c4dd..404095fb567 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -27,6 +27,12 @@ ENDIF()
 
 SET(ENV{VS_UNICODE_OUTPUT})
 
+# Switch off the monolithic install
+EXECUTE_PROCESS(
+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}
+  OUTPUT_QUIET
+)
+
 INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)
 
 IF(CPACK_WIX_CONFIG)
@@ -318,3 +324,9 @@ EXECUTE_PROCESS(
   ${EXTRA_LIGHT_ARGS}
 )
 
+# Switch monolithic install on again
+EXECUTE_PROCESS(
+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}
+  OUTPUT_QUIET
+)
+