diff --git a/cmake/VILLASnodePackaging.cmake b/cmake/VILLASnodePackaging.cmake
index 5977288c9..39e07c942 100644
--- a/cmake/VILLASnodePackaging.cmake
+++ b/cmake/VILLASnodePackaging.cmake
@@ -29,13 +29,30 @@ set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_PATCH_VERSION})
 
 set(CPACK_RPM_COMPONENT_INSTALL ON)
-set(CPACK_RPM_MAIN_COMPONENT "bin")
+set(CPACK_RPM_MAIN_COMPONENT bin)
+
+set(CPACK_RPM_LIB_PACKAGE_NAME libvillas)
+set(CPACK_RPM_DEVEL_PACKAGE_NAME libvillas-devel)
+set(CPACK_RPM_BIN_PACKAGE_NAME villas-node)
+set(CPACK_RPM_PLUGINS_PACKAGE_NAME villas-node-plugins)
+set(CPACK_RPM_TOOLS_PACKAGE_NAME villas-node-tools)
+set(CPACK_RPM_DOC_PACKAGE_NAME villas-node-doc)
+
+set(SUFFIX "${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
+set(CPACK_RPM_LIB_FILE_NAME     "${CPACK_RPM_LIB_PACKAGE_NAME}-${SUFFIX}")
+set(CPACK_RPM_DEVEL_FILE_NAME   "${CPACK_RPM_DEVEL_PACKAGE_NAME}-devel-${SUFFIX}")
+set(CPACK_RPM_BIN_FILE_NAME     "${CPACK_RPM_BIN_PACKAGE_NAME}-${SUFFIX}")
+set(CPACK_RPM_PLUGINS_FILE_NAME "${CPACK_RPM_PLUGINS_PACKAGE_NAME}-${SUFFIX}")
+set(CPACK_RPM_TOOLS_FILE_NAME   "${CPACK_RPM_TOOLS_PACKAGE_NAME}-${SUFFIX}")
+set(CPACK_RPM_DOC_FILE_NAME     "${CPACK_RPM_DOC_PACKAGE_NAME}-${SUFFIX}")
 
 set(CPACK_RPM_LIB_PACKAGE_REQUIRES "openssl libconfig libnl3 libcurl jansson libwebsockets zeromq nanomsg libiec61850 librabbitmq mosquitto comedilib")
-set(CPACK_RPM_BIN_PACKAGE_REQUIRES "libvillas")
-set(CPACK_RPM_PLUGINS_PACKAGE_REQUIRES "libvillas")
-set(CPACK_RPM_TOOLS_PACKAGE_REQUIRES "libvillas")
-set(CPACK_RPM_DEVEL_PACKAGE_REQUIRES "libvillas")
+set(CPACK_RPM_BIN_PACKAGE_REQUIRES     ${CPACK_RPM_LIB_PACKAGE_NAME})
+set(CPACK_RPM_PLUGINS_PACKAGE_REQUIRES ${CPACK_RPM_LIB_PACKAGE_NAME})
+set(CPACK_RPM_TOOLS_PACKAGE_REQUIRES   ${CPACK_RPM_LIB_PACKAGE_NAME})
+
+set(CPACK_RPM_DEVEL_PACKAGE_SUGGESTS   ${CPACK_RPM_LIB_PACKAGE_NAME})
+set(CPACK_RPM_BIN_PACKAGE_SUGGESTS "villas-node-tools villas-node-plugins villas-node-doc")
 
 set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
 set(CPACK_RPM_PACKAGE_RELEASE ${PROJECT_RELEASE})
@@ -44,14 +61,6 @@ set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
 set(CPACK_RPM_PACKAGE_URL "http://www.fein-aachen.org/projects/villas-node/")
 set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
 
-set(SUFFIX "${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
-set(CPACK_RPM_FILE_NAME "villas-node-${SUFFIX}")
-set(CPACK_RPM_TOOLS_FILE_NAME    "villas-node-tools-${SUFFIX}")
-set(CPACK_RPM_PLUGINS_FILE_NAME  "villas-node-plugins-${SUFFIX}")
-set(CPACK_RPM_DOC_FILE_NAME   "villas-node-doc-${SUFFIX}")
-set(CPACK_RPM_LIB_FILE_NAME   "libvillas-${SUFFIX}")
-set(CPACK_RPM_DEVEL_FILE_NAME "libvillas-devel-${SUFFIX}")
-
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.md")
 set(CPACK_RESOURCE_FILE_README  "${CMAKE_SOURCE_DIR}/README.md")