diff --git a/.gitattributes b/.gitattributes
index b1217ac30bc0fa221a18890dd0af23f8a919b208..8e72c2c37b6eade2d4c992051386e9d2469fc237 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2696,6 +2696,7 @@ LCS/PyCommon/test/t_util.run -text
 LCS/PyCommon/test/t_util.sh -text
 LCS/PyCommon/util.py -text
 LCS/PyServiceSkeleton/CMakeLists.txt -text
+LCS/PyServiceSkeleton/Client/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Client/lib/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Client/lib/__init__.py -text
 LCS/PyServiceSkeleton/Client/lib/serviceskeleton_rpc.py -text
@@ -2703,10 +2704,12 @@ LCS/PyServiceSkeleton/Client/test/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Client/test/t_serviceskeleton_rpc.py -text
 LCS/PyServiceSkeleton/Client/test/t_serviceskeleton_rpc.run -text
 LCS/PyServiceSkeleton/Client/test/t_serviceskeleton_rpc.sh -text
+LCS/PyServiceSkeleton/Common/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Common/lib/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Common/lib/__init__.py -text
 LCS/PyServiceSkeleton/Common/lib/config.py -text
 LCS/PyServiceSkeleton/README -text
+LCS/PyServiceSkeleton/Server/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt -text
 LCS/PyServiceSkeleton/Server/bin/serviceskeleton -text
 LCS/PyServiceSkeleton/Server/bin/serviceskeleton.ini -text
diff --git a/LCS/PyServiceSkeleton/Client/CMakeLists.txt b/LCS/PyServiceSkeleton/Client/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..27ac172bfb6a9318e7fbe6bbe868a6c891f7e98a
--- /dev/null
+++ b/LCS/PyServiceSkeleton/Client/CMakeLists.txt
@@ -0,0 +1,6 @@
+lofar_package(PyServiceClientSkeleton 1.0 DEPENDS PyServiceCommonSkeleton PyMessaging PyCommon)
+
+lofar_find_package(Python 2.7 REQUIRED)
+
+add_subdirectory(lib)
+add_subdirectory(test)
diff --git a/LCS/PyServiceSkeleton/Common/CMakeLists.txt b/LCS/PyServiceSkeleton/Common/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6ae7696487c1577d7ddb59a642e67f2a596a1ff1
--- /dev/null
+++ b/LCS/PyServiceSkeleton/Common/CMakeLists.txt
@@ -0,0 +1,5 @@
+lofar_package(PyServiceCommonSkeleton 1.0)
+
+lofar_find_package(Python 2.7 REQUIRED)
+
+add_subdirectory(lib)
diff --git a/LCS/PyServiceSkeleton/Server/CMakeLists.txt b/LCS/PyServiceSkeleton/Server/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1fb045ba47caaec67963a1d1d9cd489be526b958
--- /dev/null
+++ b/LCS/PyServiceSkeleton/Server/CMakeLists.txt
@@ -0,0 +1,7 @@
+lofar_package(PyServiceServerSkeleton 1.0 DEPENDS PyServiceCommonSkeleton PyMessaging PyCommon)
+
+lofar_find_package(Python 2.7 REQUIRED)
+
+add_subdirectory(bin)
+add_subdirectory(lib)
+add_subdirectory(test)