diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
index d1debf206..fff7608a6 100644
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -22,13 +22,4 @@
 
 add_subdirectory(python)
 add_subdirectory(opal)
-
-add_executable(villas-shmem shmem/villas-shmem.cpp)
-
-target_link_libraries(villas-shmem PUBLIC villas)
-
-install(
-    TARGETS villas-shmem
-    COMPONENT bin
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+add_subdirectory(shmem)
diff --git a/clients/shmem/CMakeLists.txt b/clients/shmem/CMakeLists.txt
new file mode 100644
index 000000000..1f6601b4c
--- /dev/null
+++ b/clients/shmem/CMakeLists.txt
@@ -0,0 +1,31 @@
+# CMakeLists.txt.
+#
+# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+# @copyright 2018, Institute for Automation of Complex Power Systems, EONERC
+# @license GNU General Public License (version 3)
+#
+# VILLASnode
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###################################################################################
+
+add_executable(villas-shmem villas-shmem.cpp)
+
+target_link_libraries(villas-shmem PUBLIC villas)
+
+install(
+    TARGETS villas-shmem
+    COMPONENT bin
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)