diff --git a/LCS/MessageBus/python/CMakeLists.txt b/LCS/MessageBus/python/CMakeLists.txt
index 143fa9181b563e0d6a752d6632fad14fe80fcd77..d7491b93d5eb9ff3ff79442198b3d25ad5be98c7 100644
--- a/LCS/MessageBus/python/CMakeLists.txt
+++ b/LCS/MessageBus/python/CMakeLists.txt
@@ -1,4 +1,4 @@
 # $Id: CMakeLists.txt 1584 2015-10-02 12:10:14Z loose $
 
-lofar_add_package(PyCommon common)
-lofar_add_package(PyMessaging messaging)
+add_subdirectory(common)
+add_subdirectory(messaging)
diff --git a/LCS/MessageBus/python/messaging/CMakeLists.txt b/LCS/MessageBus/python/messaging/CMakeLists.txt
index cd8fe67af6eff311c022edfe61eb39d3f0bad912..8a20caa152a36873142c91c0845a6fa8b2a5b177 100644
--- a/LCS/MessageBus/python/messaging/CMakeLists.txt
+++ b/LCS/MessageBus/python/messaging/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$
 
-lofar_package(PyMessaging 1.0 DEPENDS PyCommon)
+#lofar_package(PyMessaging 1.0 DEPENDS PyCommon)
 
 include(PythonInstall)
 
@@ -9,6 +9,8 @@ set(_py_files
   exceptions.py
   messagebus.py
   messages.py
+  RPC.py
+  Service.py
 )
 
 python_install(${_py_files} DESTINATION messaging)
diff --git a/LCS/MessageBus/python/messaging/Service.py b/LCS/MessageBus/python/messaging/Service.py
index 79c0ec661cc603100d464bddcb277bd97dc55090..84403777b08e88f840b6f98dae097d2b621e4228 100644
--- a/LCS/MessageBus/python/messaging/Service.py
+++ b/LCS/MessageBus/python/messaging/Service.py
@@ -42,6 +42,7 @@ class Service():
    def __enter__(self):
       self.Listen.open()
       self.Reply.open()
+      return self
 
    def __exit__(self, exc_type, exc_val, exc_tb):
       self.Listen.close()