diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c5709404..e63c6d29a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,13 @@ set(KEEPASSXC_VERSION_PATCH "0")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_RELEASE_BUILD OFF CACHE BOOLEAN "Remove stability warnings")
-if(NOT KEEPASSXC_RELEASE_BUILD)
+# Check if on a tag, if so build as a release
+execute_process(COMMAND git tag --points-at HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_TAG)
+if(GIT_TAG)
+  set(KEEPASSXC_RELEASE_BUILD ON)
+elseif(NOT KEEPASSXC_RELEASE_BUILD)
   set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
 endif()