diff --git a/CommonCPack.cmake b/CommonCPack.cmake
index af0b08c..1d5cbac 100644
--- a/CommonCPack.cmake
+++ b/CommonCPack.cmake
@@ -202,7 +202,11 @@ if(CPACK_GENERATOR STREQUAL "DEB")
   # Note: the ~codename is not part of any standard and could be omitted.
   if(NOT CPACK_DEBIAN_PACKAGE_VERSION)
     include(LSBInfo)
-    set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}~${LSB_CODENAME}")
+    if (${LSB_CODENAME} STREQUAL "bionic")
+      set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
+    elseif()
+      set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}~${LSB_CODENAME}")
+    endif()
   endif()
   if(NOT CPACK_PACKAGE_FILE_NAME)
     get_debian_arch(_deb_arch)