diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6d28a35f..ea32e100b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,8 +52,12 @@ set(KEEPASSXC_VERSION_MINOR "2")
 set(KEEPASSXC_VERSION_PATCH "1")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
-# Special flag for snap builds
-set(KEEPASSXC_SNAP_BUILD OFF CACHE BOOL "Set whether this is a build for snap or not")
+# Distribution info
+set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type")
+set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
+if(NOT KEEPASSXC_DIST_TYPE STREQUAL "Other")
+  set(KEEPASSXC_DIST True)
+endif()
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
index f89d447c7..e0d96e0c0 100644
--- a/src/config-keepassx.h.cmake
+++ b/src/config-keepassx.h.cmake
@@ -16,7 +16,8 @@
 #cmakedefine WITH_XC_AUTOTYPE
 #cmakedefine WITH_XC_YUBIKEY
 
-#cmakedefine KEEPASSXC_SNAP_BUILD
+#cmakedefine KEEPASSXC_DIST
+#cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@"
 
 #cmakedefine HAVE_PR_SET_DUMPABLE 1
 #cmakedefine HAVE_RLIMIT_CORE 1
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 0e0f2960a..5978cd956 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -55,10 +55,14 @@ AboutDialog::AboutDialog(QWidget* parent)
     QString debugInfo = "KeePassXC - ";
     debugInfo.append(tr("Version %1\n").arg(KEEPASSX_VERSION));
     if (!commitHash.isEmpty()) {
-        debugInfo.append(tr("Revision: %1").arg(commitHash).append("\n\n"));
+        debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n"));
     }
 
-    debugInfo.append(QString("%1\n- Qt %2\n- %3\n\n")
+#ifdef KEEPASSXC_DIST
+    debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n"));
+#endif
+
+    debugInfo.append("\n").append(QString("%1\n- Qt %2\n- %3\n\n")
              .arg(tr("Libraries:"))
              .arg(QString::fromLocal8Bit(qVersion()))
              .arg(Crypto::backendVersion()));