diff --git a/cmake/VILLASnodePackaging.cmake b/cmake/VILLASnodePackaging.cmake
index 9e8a1fc80..913eb8904 100644
--- a/cmake/VILLASnodePackaging.cmake
+++ b/cmake/VILLASnodePackaging.cmake
@@ -20,7 +20,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_BUILD_SOURCE_DIRS ${PROJECT_SOURCE_DIR}/src;${PROJECT_SOURCE_DIR}/lib;${PROJECT_SOURCE_DIR}/include)
+
+set(CPACK_PACKAGE_NAME "villas-node")
 set(CPACK_PACKAGE_VENDOR ${PROJECT_AUTHOR})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is VILLASnode, a gateway for processing and forwardning simulation data between real-time simulators.")
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
@@ -28,9 +30,17 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_PATCH_VERSION})
 
+set(CPACK_RPM_PACKAGE_RELEASE ${PROJECT_RELEASE})
+set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
+
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_RPM_MAIN_COMPONENT bin)
 
+#set(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+#set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
+#set(CPACK_RPM_DEBUGINGO_PACKAGE_NAME villas-node-debuginfo)
+#set(CPACK_RPM_DEBUGINFO_PACKAGE "${CPACK_RPM_DEBUGINGO_PACKAGE_NAME}-${SUFFIX}")
+
 set(CPACK_RPM_LIB_PACKAGE_NAME libvillas)
 set(CPACK_RPM_DEVEL_PACKAGE_NAME libvillas-devel)
 set(CPACK_RPM_BIN_PACKAGE_NAME villas-node)
@@ -40,7 +50,7 @@ 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_DEVEL_FILE_NAME   "${CPACK_RPM_DEVEL_PACKAGE_NAME}-${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}")
@@ -50,8 +60,8 @@ set(CPACK_RPM_LIB_PACKAGE_REQUIRES "openssl libconfig libnl3 libcurl jansson lib
 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_REQUIRES   "${CPACK_RPM_LIB_PACKAGE_NAME} openssl openssl-devel libconfig-devel libnl3-devel libcurl-devel jansson-devel zeromq-devel nanomsg-devel protobuf-devel protobuf-c-devel libiec61850-devel librabbitmq-devel mosquitto-devel comedilib-devel comedilib libibverbs-devel librdmacm-devel")
 
-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)