diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index e45ee9484..8aa10c76e 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -23,7 +23,7 @@
 install(
 	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	COMPONENT bin
-	DESTINATION etc/villas/node
+	DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/villas/node
 	FILES_MATCHING
 		PATTERN "*.conf"
 		PATTERN "*.json"
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ace78fb29..e65aa0058 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -181,13 +181,3 @@ install(
         PATTERN "*.h"
         PATTERN "*.hpp"
 )
-
-#install(
-#    EXPORT VILLASNodeConfig
-#   DESTINATION share/VILLASNode/cmake
-#)
-
-#export(
-#    TARGETS villas
-#    FILE VILLASNodeConfig.cmake
-#)
diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
index 787e17c7c..f8264d8c1 100644
--- a/web/CMakeLists.txt
+++ b/web/CMakeLists.txt
@@ -23,5 +23,5 @@
 install(
 	DIRECTORY socket/
 	COMPONENT bin
-	DESTINATION share/villas/node/web
+	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/villas/node/web
 )