diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8369c8f86633337064dfd8b8f3a24880d09bc3b..20a0d3193d4654edc1a6cc92ce5631504c255526 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,11 +38,11 @@ add_subdirectory(cellframe-sdk)
 
 
 if(UNIX)
-  if(LINUX)
-    message("[*] Linux package setup")
     SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
     SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
     SET(DESTDIR "/opt/${PROJECT_NAME}")
+  if(LINUX)
+    message("[*] Linux package setup")
 
     SET( CPACK_GENERATOR "DEB")
 
@@ -175,6 +175,12 @@ if(NOT ANDROID)
 endif()
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*"  PATTERN "*")
+if(LINUX)
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.linux/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*"  PATTERN "*")
+elseif(BSD)
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*"  PATTERN "*")
+endif()
+
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
 
 if(UNIX AND NOT ANDROID)
diff --git a/dist/share/apt/demlabskey.gpg b/dist.linux/share/apt/demlabskey.gpg
similarity index 100%
rename from dist/share/apt/demlabskey.gpg
rename to dist.linux/share/apt/demlabskey.gpg
diff --git a/dist/share/cellframe-node.service b/dist.linux/share/cellframe-node.service
similarity index 100%
rename from dist/share/cellframe-node.service
rename to dist.linux/share/cellframe-node.service
diff --git a/dist/share/doc/changelog b/dist.linux/share/doc/changelog
similarity index 100%
rename from dist/share/doc/changelog
rename to dist.linux/share/doc/changelog
diff --git a/dist/share/logrotate/cellframe-node b/dist.linux/share/logrotate/cellframe-node
similarity index 100%
rename from dist/share/logrotate/cellframe-node
rename to dist.linux/share/logrotate/cellframe-node
diff --git a/dist/share/profile.d/cellframe-node.sh b/dist.linux/share/profile.d/cellframe-node.sh
similarity index 100%
rename from dist/share/profile.d/cellframe-node.sh
rename to dist.linux/share/profile.d/cellframe-node.sh