diff --git a/CMakeLists.txt b/CMakeLists.txt
index edea611cf..691f8245d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,6 +449,10 @@ add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro targe
 ### CALAMARES PROPER
 #
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
+# In rare cases we have hotfix-releases with a tweak
+if( CALAMARES_VERSION_TWEAK )
+    set( CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}" )
+endif()
 set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )
 if( CALAMARES_VERSION_RC )
     set( CALAMARES_VERSION ${CALAMARES_VERSION}rc${CALAMARES_VERSION_RC} )