diff --git a/.gitignore b/.gitignore
index 9f05cfe62f5dbdefb362093324ff560e5fc11b3f..64cc652d38e5aa06f778df4dab8fe1cd25c252ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ build/
 # CMake config files
 *Config.cmake
 *ConfigVersion.cmake
+Version.h
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd1257508a60523428a0ded6f0b6eb8829e57c2e..882d45d1cd6a5a5cdf9fadea9bcf74f51714e1ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,10 +28,24 @@ option(CMAKE_MACOSX_RPATH "Build with rpath on macos" ON)
 #  project version (Major,minor,patch)
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #  !! Use the same version numbers in DDSegmentation/CMakeLists.txt    !!
-#  !! and make also sure to change in DDCore/include/DD4hep/LCDD.h     !!
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #
-dd4hep_set_version(DD4hep MAJOR 0 MINOR 20 PATCH 0)
+# project version
+SET( DD4hep_VERSION_MAJOR 0  )
+SET( DD4hep_VERSION_MINOR 22 )
+SET( DD4hep_VERSION_PATCH 0  )
+
+dd4hep_set_version(DD4hep
+  MAJOR ${DD4hep_VERSION_MAJOR}
+  MINOR ${DD4hep_VERSION_MINOR}
+  PATCH ${DD4hep_VERSION_PATCH} )
+
+configure_file (
+  "${PROJECT_SOURCE_DIR}/cmake/Version.h.in"
+  "${PROJECT_SOURCE_DIR}/DDCore/include/DD4hep/Version.h"
+  )
+
+
 dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL_PREFIX}" )
 #
 # Include ROOT
diff --git a/DDCore/include/DD4hep/LCDD.h b/DDCore/include/DD4hep/LCDD.h
index 75f8f6deb0b9f63721ffe05144a6c367f215f32d..4ef65b038e059f8719ebe77ca220eea41983bfdd 100644
--- a/DDCore/include/DD4hep/LCDD.h
+++ b/DDCore/include/DD4hep/LCDD.h
@@ -13,18 +13,7 @@
 #ifndef DD4HEP_LCDD_LCDD_H
 #define DD4HEP_LCDD_LCDD_H
 
-// define version macros for DD4hep
-#define DD4HEP_MAJOR_VERSION 0
-#define DD4HEP_MINOR_VERSION 19
-
-#define DD4HEP_VERSION_GE(MAJV,MINV)  ( (  DD4HEP_MAJOR_VERSION  > MAJV ) || \
-                                        ( (DD4HEP_MAJOR_VERSION == MAJV ) && \
-                                          (DD4HEP_MINOR_VERSION >= MINV ) ) )
-
-#define DD4HEP_VERSION_GT(MAJV,MINV)  ( (  DD4HEP_MAJOR_VERSION  > MAJV ) || \
-                                        ( (DD4HEP_MAJOR_VERSION == MAJV ) && \
-                                          (DD4HEP_MINOR_VERSION >  MINV ) ) )
-
+#include "DD4hep/Version.h"
 
 // Framework includes
 #include "DD4hep/Handle.h"
diff --git a/DDSegmentation/CMakeLists.txt b/DDSegmentation/CMakeLists.txt
index 613f6b137daaea2e59d7203fe80629614197756c..4e2fd52e123938853cd5e1ee8e95f3f48c9caeab 100644
--- a/DDSegmentation/CMakeLists.txt
+++ b/DDSegmentation/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 project(DDSegmentation)
  #fg: version number must be the same as DD4hep !!
 set(DDSegmentation_MAJOR_VERSION 0)
-set(DDSegmentation_MINOR_VERSION 20)
+set(DDSegmentation_MINOR_VERSION 19)
 set(DDSegmentation_PATCH_VERSION 0)
 set(DDSegmentation_VERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}" )
 set(DDSegmentation_SOVERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}")
diff --git a/cmake/Version.h.in b/cmake/Version.h.in
new file mode 100644
index 0000000000000000000000000000000000000000..75c63a997ad2fdfb14136f8a4f3011d9cc4b2f58
--- /dev/null
+++ b/cmake/Version.h.in
@@ -0,0 +1,29 @@
+//==========================================================================
+//  AIDA Detector description implementation for LCD
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
+//
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
+//
+// Author     : A.Sailer
+//
+//==========================================================================
+#ifndef DD4HEP_VERSION_H
+#define DD4HEP_VERSION_H 1
+
+// define version macros for DD4hep
+#define DD4HEP_MAJOR_VERSION @DD4hep_VERSION_MAJOR@
+#define DD4HEP_MINOR_VERSION @DD4hep_VERSION_MINOR@
+
+#define DD4HEP_VERSION_GE(MAJV,MINV)  ( (  DD4HEP_MAJOR_VERSION  > MAJV ) || \
+                                        ( (DD4HEP_MAJOR_VERSION == MAJV ) && \
+                                          (DD4HEP_MINOR_VERSION >= MINV ) ) )
+
+#define DD4HEP_VERSION_GT(MAJV,MINV)  ( (  DD4HEP_MAJOR_VERSION  > MAJV ) || \
+                                        ( (DD4HEP_MAJOR_VERSION == MAJV ) && \
+                                          (DD4HEP_MINOR_VERSION >  MINV ) ) )
+
+
+#endif // DD4HEP_VERSION_H