diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7659ffa21..33cebdb85f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,10 @@ project(FreeCAD)
 set(PACKAGE_VERSION_NAME "Vulcan")
 set(PACKAGE_VERSION_MAJOR "0")
 set(PACKAGE_VERSION_MINOR "21")
-set(PACKAGE_VERSION_PATCH "0")
+set(PACKAGE_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
 set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
-set(FREECAD_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
+set(PACKAGE_BUILD_VERSION "0") # used when the same FreeCAD version will be re-released (for example using an updated LibPack)
 
-set(FREECAD_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 set(PACKAGE_STRING "${PROJECT_NAME} ${PACKAGE_VERSION}")
 
diff --git a/config.h.cmake b/config.h.cmake
index ac199ea5ae..97c068e6cf 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -127,13 +127,13 @@
 #define PACKAGE_NAME "FreeCAD"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "FreeCAD ${FREECAD_VERSION}"
+#define PACKAGE_STRING "${PACKAGE_STRING}"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "FreeCAD"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "${FREECAD_VERSION}"
+#define PACKAGE_VERSION "${PACKAGE_VERSION}"
 
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS
@@ -142,7 +142,7 @@
 #cmakedefine USE_STD_IOSTREAM
 
 /* Version number of package */
-#define VERSION "${FREECAD_VERSION}"
+#define VERSION "${PACKAGE_VERSION}"
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #cmakedefine X_DISPLAY_MISSING */
diff --git a/src/Build/Version.h.cmake b/src/Build/Version.h.cmake
index b9a172caa6..71abdd4813 100644
--- a/src/Build/Version.h.cmake
+++ b/src/Build/Version.h.cmake
@@ -3,6 +3,7 @@
 #define FCVersionMajor "${PACKAGE_VERSION_MAJOR}"
 #define FCVersionMinor "${PACKAGE_VERSION_MINOR}"
 #define FCVersionName  "${PACKAGE_VERSION_NAME}"
+#define FCVersionPoint "${PACKAGE_VERSION_PATCH}"
 // test: $Format:Hash (%H), Date: %ci$
 #define FCRevision      "${PACKAGE_WCREF}"      //Highest committed revision number
 #define FCRevisionDate  "${PACKAGE_WCDATE}"     //Date of highest committed revision
diff --git a/src/Main/freecad.rc.cmake b/src/Main/freecad.rc.cmake
index 5fd1c1efea..c319021bb6 100644
--- a/src/Main/freecad.rc.cmake
+++ b/src/Main/freecad.rc.cmake
@@ -13,7 +13,7 @@ IDI_ICON1               ICON    DISCARDABLE     "icon.ico"
 // File info for the FreeCAD.exe
 //
 1 VERSIONINFO 
-FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${FREECAD_VERSION_PATCH},${PACKAGE_VERSION_PATCH}
+FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -25,7 +25,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright (C) 2022"
             VALUE "OriginalFilename", "FreeCAD.exe"
             VALUE "ProductName", "${PROJECT_NAME}"
-            VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}"
+            VALUE "ProductVersion", "${PACKAGE_VERSION}${PACKAGE_VERSION_SUFFIX}"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/Main/freecadCmd.rc.cmake b/src/Main/freecadCmd.rc.cmake
index acb5ed4585..0d701a1039 100644
--- a/src/Main/freecadCmd.rc.cmake
+++ b/src/Main/freecadCmd.rc.cmake
@@ -13,7 +13,7 @@ IDI_ICON1               ICON    DISCARDABLE     "icon.ico"
 // File info for the FreeCADCmd.exe
 //
 1 VERSIONINFO 
-FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${FREECAD_VERSION_PATCH},${PACKAGE_VERSION_PATCH}
+FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -25,7 +25,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright (C) 2022"
             VALUE "OriginalFilename", "FreeCADCmd.exe"
             VALUE "ProductName", "${PROJECT_NAME}"
-            VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}"
+            VALUE "ProductVersion", "${PACKAGE_VERSION}${PACKAGE_VERSION_SUFFIX}"
         END
     END
     BLOCK "VarFileInfo"