diff --git a/CMakeLists.txt b/CMakeLists.txt
index c259a5c5b..f05c1e2e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,21 +72,21 @@ add_subdirectory(server)
 add_subdirectory(client)
 
 if(BUILD_RABBITMQ)
+  message(STATUS "Building RabbitMQ components")
   add_subdirectory(rabbitmq_consumer)
 endif(BUILD_RABBITMQ)
 
 file(GLOB DOCS Documentation/*.pdf)
 
-
-if(NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
-  message(STATUS "Will install system files")
-  install(FILES server/test/MaxScale_test.cnf RENAME MaxScale.cnf DESTINATION /etc)
+if( NOT ( (DEFINED INSTALL_SYSTEM_FILES) AND ( ${INSTALL_SYSTEM_FILES} MATCHES "N" ) ) )
   install(FILES maxscale.conf DESTINATION /etc/ld.so.conf.d)
   install(FILES etc/init.d/maxscale DESTINATION /etc/init.d)
-else()
-  install(FILES server/test/MaxScale_test.cnf RENAME MaxScale.cnf DESTINATION etc)
+  message(STATUS "Installing maxscale.conf to: /etc/ld.so.conf.d")
+  message(STATUS "Installing startup scripts to: /etc/init.d")
 endif()
 
+message(STATUS "Installing MaxScale to: ${CMAKE_INSTALL_PREFIX}/")
+install(FILES server/test/MaxScale_test.cnf RENAME MaxScale.cnf DESTINATION etc)
 install(FILES ${ERRMSG} DESTINATION mysql)
 install(FILES ${EMBEDDED_LIB} DESTINATION lib)
 install(FILES ${DOCS} DESTINATION Documentation)
diff --git a/README b/README
index 5a0e2eb23..aba2ceb4c 100644
--- a/README
+++ b/README
@@ -178,6 +178,7 @@ Variables controlling the CMake build process:
 
 CMAKE_INSTALL_PREFIX=<path>		Install destination prefix, same as DEST
 CMAKE_BUILD_TYPE=[Debug|Release]	Type of the build
+INSTALL_SYSTEM_FILES=[Y|N]		Install startup scripts and ld configuration files
 EMBEDDED_LIB=<path>			Path to the embedded library, filename included
 MYSQL_DIR=<path>			Path to MySQL headers
 STATIC_EMBEDDED=[Y|N]			Link the static or the dynamic verson of the library