diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceb42c712..467c2d80c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,8 @@ set(KATIE_MINOR "9")
 set(KATIE_MICRO "0")
 set(KATIE_HEX "0x040900")
 set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
-# this one is set via macro later, if possible
-set(KATIE_GIT "unknown")
+# this one is set via macro later, if possible. also used in config.cpp.cmake
+set(KATIE_GIT "unstable-${KATIE_VERSION}")
 
 # components and tools that will be build, changed depending on the requirements availability
 # NOTE: excluding DesignerComponents as it was never used as public component, currently only
diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake
index dd675beac..6a89a1a0d 100644
--- a/cmake/KatieConfig.cmake
+++ b/cmake/KatieConfig.cmake
@@ -19,7 +19,6 @@
 #  KATIE_TOOLS_SUFFIX           - tools suffix set when the project was build
 #  KATIE_COMPONENTS             - components that were build
 #  KATIE_TOOLS                  - tools that were build
-#  KATIE_KEY                    - build key, used in plugins verification check
 
 # avoiding use of return()
 if(NOT KATIE_FOUND)
@@ -57,7 +56,6 @@ if(NOT KATIE_FOUND)
     set(KATIE_TOOLS_SUFFIX "@KATIE_TOOLS_SUFFIX@")
     set(KATIE_MKSPECS_DIR "${CMAKE_CURRENT_LIST_DIR}/mkspecs")
     set(KATIE_TYPE @KATIE_TYPE@)
-    set(KATIE_KEY "@KATIE_KEY@")
 
     foreach(component ${KATIE_COMPONENTS})
         string(TOUPPER ${component} uppercomp)
diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index a8d05d4d2..30a48d0af 100644
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -1,4 +1,4 @@
-# KatieConfig overrides KATIE_TYPE and KATIE_KEY
+# KatieConfig overrides KATIE_TYPE
 
 if(NOT KATIE_TYPE)
     set(KATIE_TYPE SHARED)
@@ -90,10 +90,6 @@ if(NOT bsymbolic_functions_test OR NOT CMAKE_POSITION_INDEPENDENT_CODE)
     katie_definition(-DQ_NO_DATA_RELOCATION)
 endif()
 
-if(NOT KATIE_KEY)
-    set(KATIE_KEY "${KATIE_ARCHITECTURE}-${KATIE_PLATFORM}-${KATIE_COMPILER}")
-endif()
-
 # Set compiler standard to C++ 11, appending to CMAKE_CXX_FLAGS is done so that try_compile() is
 # also affected, which KDE uses for visibility check for an example
 if(KATIE_COMPILER STREQUAL "gcc")
diff --git a/src/core/global/qconfig.cpp.cmake b/src/core/global/qconfig.cpp.cmake
index 46602408a..67c3965a8 100644
--- a/src/core/global/qconfig.cpp.cmake
+++ b/src/core/global/qconfig.cpp.cmake
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-/* Installation date */
-static const char* qt_configure_installation           = "${KATIE_DATE}";
-
-/* License Info */
+/* Build information */
+static const char* qt_configure_build_key_str          = "${KATIE_GIT}\0";
+static const char* qt_configure_build_date_str         = "${KATIE_DATE}\0";
 static const char* qt_configure_licensee_str           = "${KATIE_LICENSE}\0";
 static const char* qt_configure_licensed_products_str  = "${KATIE_PRODUCT}\0";
 
+/* Runtime paths */
 static const char* qt_configure_prefix_path_str        = "${KATIE_PREFIX_FULL}\0";
 static const char* qt_configure_headers_path_str       = "${KATIE_HEADERS_FULL}\0";
 static const char* qt_configure_libraries_path_str     = "${KATIE_LIBRARIES_FULL}\0";
diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index 70c9e4761..bd640d232 100644
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -93,14 +93,6 @@
 
 /* Qt build specs */
 #define QT_KATIE
-#ifndef QT_EDITION
-#  define QT_EDITION QT_EDITION_DESKTOP
-#endif
-
-#ifndef QT_BUILD_KEY
-#  define QT_BUILD_KEY "${KATIE_KEY}"
-#endif
-
 #cmakedefine QT_VISIBILITY_AVAILABLE
 #cmakedefine QT_LARGEFILE_SUPPORT ${QT_LARGEFILE_SUPPORT}
 #cmakedefine QT_POINTER_SIZE ${QT_POINTER_SIZE}
diff --git a/src/core/global/qlibraryinfo.cpp b/src/core/global/qlibraryinfo.cpp
index e8828e293..79641bc90 100644
--- a/src/core/global/qlibraryinfo.cpp
+++ b/src/core/global/qlibraryinfo.cpp
@@ -106,8 +106,7 @@ QLibraryInfo::licensedProducts()
 /*!
     Returns a unique key identifying this build of Qt and its
     configurations. This key is not globally unique, rather only useful
-    for establishing of two configurations are compatible. This can be
-    used to compare with the \c QT_BUILD_KEY preprocessor symbol.
+    for establishing of two configurations are compatible.
 
     \sa location()
 */
@@ -115,7 +114,7 @@ QLibraryInfo::licensedProducts()
 QString
 QLibraryInfo::buildKey()
 {
-    return QString::fromLatin1(QT_BUILD_KEY);
+    return QString::fromLatin1(qt_configure_build_key_str);
 }
 
 /*!
@@ -127,7 +126,7 @@ QLibraryInfo::buildKey()
 QDate
 QLibraryInfo::buildDate()
 {
-    return QDate::fromString(QString::fromLatin1(qt_configure_installation), Qt::ISODate);
+    return QDate::fromString(QString::fromLatin1(qt_configure_build_date_str), Qt::ISODate);
 }
 #endif //QT_NO_DATESTRING