diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8321c642..3c993724 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,6 +231,7 @@ if(REPO_HAS_TAG EQUAL 0)
     set(PACKAGE_NAME_SUFFIX "")
 else()
     set(PACKAGE_NAME_SUFFIX "-git")
+    message(STATUS "Use -git suffix")
 endif()
 
 # default CPack generators
@@ -250,10 +251,11 @@ set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/${DISTRO_PACK_PATH})
 message(STATUS "CPack: packages will be generated under ${CPACK_PACKAGE_DIRECTORY}")
 if(BUILD_SHARED_LIBS)
     set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
+    set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}${PROJECT_VERSION_MAJOR}")
 else()
     set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-devel")
+    set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}-dev")
 endif()
-set(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}${PACKAGE_NAME_SUFFIX}")
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LibTomMath")
 set(CPACK_PACKAGE_VENDOR "libtom projects")
@@ -270,7 +272,6 @@ set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION})
 if(BUILD_SHARED_LIBS)
     set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
 else()
-    set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}-dev")
     set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
 endif()