diff --git a/.gitattributes b/.gitattributes
index 24c2def09a84d543d9138076f188b6f8022999d0..332bf479088ebdfa09b4f0bef3e6d301304cd3f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3698,7 +3698,10 @@ MAC/Services/TBB/TBBServer/test/CMakeLists.txt -text
 MAC/Services/TBB/TBBServer/test/t_tbbserver.py -text
 MAC/Services/TBB/TBBServer/test/t_tbbserver.run -text
 MAC/Services/TBB/TBBServer/test/t_tbbserver.sh -text
-MAC/Services/TBB/config.py -text
+MAC/Services/TBB/TBBServiceCommon/CMakeLists.txt -text
+MAC/Services/TBB/TBBServiceCommon/lib/CMakeLists.txt -text
+MAC/Services/TBB/TBBServiceCommon/lib/__init__.py -text
+MAC/Services/TBB/TBBServiceCommon/lib/config.py -text
 MAC/Services/TaskManagement/CMakeLists.txt -text
 MAC/Services/TaskManagement/Client/CMakeLists.txt -text
 MAC/Services/TaskManagement/Client/lib/CMakeLists.txt -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index c550ac44eaec4266b9d0cde437e003dbd6358e75..689e72514224876c6efbb694abf17a4c89681282 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -1,7 +1,7 @@
 # - Create for each LOFAR package a variable containing the absolute path to
 # its source directory. 
 #
-# Generated by gen_LofarPackageList_cmake.sh at Mi 21. Nov 10:48:40 CET 2018
+# Generated by gen_LofarPackageList_cmake.sh at vr 18 jan 2019 15:16:58 CET
 #
 #                      ---- DO NOT EDIT ----
 #
@@ -151,6 +151,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(TBBService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TBB)
   set(TBBClient_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TBB/TBBClient)
   set(TBBServer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TBB/TBBServer)
+  set(TBBServiceCommon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TBB/TBBServiceCommon)
   set(TaskManagementClient_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TaskManagement/Client)
   set(TaskManagementCommon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TaskManagement/Common)
   set(TaskManagementServer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/Services/TaskManagement/Server)
diff --git a/MAC/Services/TBB/CMakeLists.txt b/MAC/Services/TBB/CMakeLists.txt
index 19e79ab962c640d567bb45d3615fd7b337f97609..4095ddf3d1998f0944e84495acf22ebeb61835ef 100644
--- a/MAC/Services/TBB/CMakeLists.txt
+++ b/MAC/Services/TBB/CMakeLists.txt
@@ -1,9 +1,6 @@
-
-include(PythonInstall)
-python_install(config.py
-               DESTINATION lofar/mac/tbbservice)
+lofar_package(TBBService 2.0 DEPENDS TBBClient TBBServer TBB)
 
 lofar_add_package(TBBClient)
 lofar_add_package(TBBServer)
+lofar_add_package(TBBServiceCommon)
 
-lofar_package(TBBService 2.0 DEPENDS TBBClient TBBServer TBB)
diff --git a/MAC/Services/TBB/TBBClient/CMakeLists.txt b/MAC/Services/TBB/TBBClient/CMakeLists.txt
index b541e8c2701ea473970971c664ad664b9574b50e..d1f2310cdd00216ed88ed10ab6ff041b2700bd52 100644
--- a/MAC/Services/TBB/TBBClient/CMakeLists.txt
+++ b/MAC/Services/TBB/TBBClient/CMakeLists.txt
@@ -1,4 +1,4 @@
-lofar_package(TBBClient 2.0 DEPENDS PyMessaging PyCommon)
+lofar_package(TBBClient 2.0 DEPENDS PyMessaging PyCommon TBBServiceCommon)
 
 include(PythonInstall)
 
diff --git a/MAC/Services/TBB/TBBServer/CMakeLists.txt b/MAC/Services/TBB/TBBServer/CMakeLists.txt
index d0e9e7399d4cb326375b24369195ca63bd77b547..e7cea58ca2b34437ecc5f3fd8a94c653d74a40d4 100644
--- a/MAC/Services/TBB/TBBServer/CMakeLists.txt
+++ b/MAC/Services/TBB/TBBServer/CMakeLists.txt
@@ -1,4 +1,4 @@
-lofar_package(TBBServer 2.0 DEPENDS TBB TBBClient PyMessaging OTDB_Services ResourceAssignmentService pyparameterset)
+lofar_package(TBBServer 2.0 DEPENDS TBB TBBClient TBBServiceCommon PyMessaging OTDB_Services ResourceAssignmentService pyparameterset)
 
 add_subdirectory(lib)
 add_subdirectory(bin)
diff --git a/MAC/Services/TBB/TBBServiceCommon/CMakeLists.txt b/MAC/Services/TBB/TBBServiceCommon/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c9efdf2ed2955c9535b1d534cd8b887a1fb9d79b
--- /dev/null
+++ b/MAC/Services/TBB/TBBServiceCommon/CMakeLists.txt
@@ -0,0 +1,3 @@
+lofar_package(TBBServiceCommon 2.0 DEPENDS PyCommon)
+
+add_subdirectory(lib)
diff --git a/MAC/Services/TBB/TBBServiceCommon/lib/CMakeLists.txt b/MAC/Services/TBB/TBBServiceCommon/lib/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..206824363c3d4bd996f4dc03f8e418f107486ada
--- /dev/null
+++ b/MAC/Services/TBB/TBBServiceCommon/lib/CMakeLists.txt
@@ -0,0 +1,5 @@
+include(PythonInstall)
+python_install(__init__.py
+               config.py
+               DESTINATION lofar/mac/tbbservice)
+
diff --git a/MAC/Services/TBB/TBBServiceCommon/lib/__init__.py b/MAC/Services/TBB/TBBServiceCommon/lib/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/MAC/Services/TBB/config.py b/MAC/Services/TBB/TBBServiceCommon/lib/config.py
similarity index 100%
rename from MAC/Services/TBB/config.py
rename to MAC/Services/TBB/TBBServiceCommon/lib/config.py