Index: kdevplatform/CMakeLists.txt
===================================================================
--- kdevplatform/CMakeLists.txt
+++ kdevplatform/CMakeLists.txt
@@ -2,8 +2,9 @@
 # E.g. for KDevelop 5.2.0 => SOVERSION 52 (we only promise ABI compatibility between patch version updates)
 set(KDEVPLATFORM_SOVERSION ${KDEVELOP_SOVERSION})
 
-# Increase this to reset incompatible item-repositories
-set(KDEV_ITEMREPOSITORY_VERSION 87)
+# Increase this to reset incompatible item-repositories.
+# Changing KDEVELOP_VERSION automatically resets the itemrepository as well.
+set(KDEV_ITEMREPOSITORY_INCREMENT 0)
 
 set(KDevPlatform_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDevPlatform_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
Index: kdevplatform/config-kdevplatform.h.cmake
===================================================================
--- kdevplatform/config-kdevplatform.h.cmake
+++ kdevplatform/config-kdevplatform.h.cmake
@@ -1,6 +1,11 @@
 #ifndef CONFIG_KDEVPLATFORM_H
 #define CONFIG_KDEVPLATFORM_H
 
-#define KDEV_ITEMREPOSITORY_VERSION @KDEV_ITEMREPOSITORY_VERSION@
+#include "kdevelop_version.h"
+
+#define KDEV_ITEMREPOSITORY_VERSION (KDEVELOP_VERSION_MAJOR << 24) \
+                                  + (KDEVELOP_VERSION_MINOR << 16) \
+                                  + (KDEVELOP_VERSION_PATCH << 8) \
+                                  + @KDEV_ITEMREPOSITORY_INCREMENT@
 
 #endif
Index: kdevplatform/serialization/itemrepositoryregistry.cpp
===================================================================
--- kdevplatform/serialization/itemrepositoryregistry.cpp
+++ kdevplatform/serialization/itemrepositoryregistry.cpp
@@ -74,7 +74,7 @@
   }
 
   if (!dir.exists(QStringLiteral("version_%1").arg(staticItemRepositoryVersion()))) {
-    qCWarning(SERIALIZATION) << "version-hint not found, seems to be an old version";
+    qCWarning(SERIALIZATION) << "version mismatch or no version hint; expected version:" << staticItemRepositoryVersion();
     return true;
   }