diff --git a/LCS/MessageBus/CMakeLists.txt b/LCS/MessageBus/CMakeLists.txt
index 455f009360d59e02854b0d302ba829fe73d609cf..79681fa1c2406127834d90e2b4f57892e6ecdee7 100644
--- a/LCS/MessageBus/CMakeLists.txt
+++ b/LCS/MessageBus/CMakeLists.txt
@@ -5,5 +5,6 @@ lofar_package(MessageBus 1.0 DEPENDS Common)
 include(LofarFindPackage)
 lofar_find_package(QPID)
 
+add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/LCS/MessageBus/include/CMakeLists.txt b/LCS/MessageBus/include/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0dd022fe577f075d151a2df7bb7eccdfd08c8d99
--- /dev/null
+++ b/LCS/MessageBus/include/CMakeLists.txt
@@ -0,0 +1,12 @@
+# $Id$
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+
+# Install header files.
+install(FILES
+  MsgBus.h
+  DESTINATION include/${PACKAGE_NAME})
+
diff --git a/LCS/MessageBus/src/MsgBus.h b/LCS/MessageBus/include/MsgBus.h
similarity index 100%
rename from LCS/MessageBus/src/MsgBus.h
rename to LCS/MessageBus/include/MsgBus.h
diff --git a/LCS/MessageBus/src/CMakeLists.txt b/LCS/MessageBus/src/CMakeLists.txt
index c07e782758734fa2e01cc618d5b6173ac18f0525..224c4bb7223c47f3423828053b9e2e55261db3f0 100644
--- a/LCS/MessageBus/src/CMakeLists.txt
+++ b/LCS/MessageBus/src/CMakeLists.txt
@@ -2,11 +2,6 @@
 
 include(LofarPackageVersion)
 
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
-
 set(messagebus_LIB_SRCS
   Package__Version.cc
   MsgBus.cc)
diff --git a/LCS/MessageBus/src/MsgBus.cc b/LCS/MessageBus/src/MsgBus.cc
index 998b63f1b3145f6c2602f338d37f12999af2cc7c..1e33fddb178eb1251f847e6d33cfb5375e15f1c1 100644
--- a/LCS/MessageBus/src/MsgBus.cc
+++ b/LCS/MessageBus/src/MsgBus.cc
@@ -1,4 +1,4 @@
-#include "MsgBus.h"
+#include <MessageBus/MsgBus.h>
 
 using namespace qpid::messaging;
 using namespace qpid::types;