diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 92c344a..2703138 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,7 +1,7 @@
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(MY_RPM_NAME_PREFIX "${lib_name}-debug")
+    set(MY_RPM_NAME_PREFIX "lib${lib_name}-debug")
 else()
-    set(MY_RPM_NAME_PREFIX "${lib_name}")
+    set(MY_RPM_NAME_PREFIX "lib${lib_name}")
 endif()
 
 message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
@@ -17,7 +17,7 @@ execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\
 # RPM Build
 set(CPACK_GENERATOR "RPM")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
-set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
 set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
 set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
 set(CPACK_RPM_PACKAGE_DEBUG 1)
@@ -28,21 +28,21 @@ set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
 set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
+set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
+set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
 
-if(ENABLE_DEVEL)
-	set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-	set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-devel-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_COMPONENT_LIBRARY_GROUP "library")
 
-	set(CPACK_COMPONENT_LIBRARY_GROUP "devel")
-	set(CPACK_COMPONENT_HEADER_GROUP "devel")
-	set(CPACK_COMPONENTS_ALL LIBRARY HEADER)
-else()
-	set(CPACK_RPM_FILE_NAME "${MY_RPM_NAME_PREFIX}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-	set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${MY_RPM_NAME_PREFIX}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_COMPONENT_HEADER_GROUP "header")
 
-	set(CPACK_COMPONENT_LIBRARY_GROUP "library")
-	set(CPACK_COMPONENTS_ALL LIBRARY)
-endif()
+set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
+set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
+
+set(CPACK_COMPONENTS_ALL LIBRARY HEADER)
 
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e79378..f19b34e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,8 +35,8 @@ target_include_directories(maat_frame_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 target_link_libraries(maat_frame_shared hiredis-vip-static ${MAAT_DEPEND_DYN_LIB})
 target_link_libraries(maat_frame_shared igraph-static ${MAAT_DEPEND_DYN_LIB})
 
-install(FILES ${PROJECT_SOURCE_DIR}/inc/Maat_rule.h DESTINATION include/MESA/)
-install(FILES ${PROJECT_SOURCE_DIR}/inc/Maat_command.h DESTINATION include/MESA/)
-install(FILES ${PROJECT_SOURCE_DIR}/inc/stream_fuzzy_hash.h DESTINATION include/MESA/)
-install(FILES ${PROJECT_SOURCE_DIR}/inc/gram_index_engine.h DESTINATION include/MESA/)
-install(TARGETS maat_frame_shared DESTINATION /opt/MESA/lib/)
+install(FILES ${PROJECT_SOURCE_DIR}/inc/Maat_rule.h DESTINATION /opt/MESA/include/MESA/ COMPONENT HEADER)
+install(FILES ${PROJECT_SOURCE_DIR}/inc/Maat_command.h DESTINATION /opt/MESA/include/MESA/ COMPONENT HEADER)
+install(FILES ${PROJECT_SOURCE_DIR}/inc/stream_fuzzy_hash.h DESTINATION /opt/MESA/include/MESA/ COMPONENT HEADER)
+install(FILES ${PROJECT_SOURCE_DIR}/inc/gram_index_engine.h DESTINATION /opt/MESA/include/MESA/ COMPONENT HEADER)
+install(TARGETS maat_frame_shared LIBRARY DESTINATION /opt/MESA/lib/ COMPONENT LIBRARY)