diff --git a/Installation/lib/cmake/CGAL/CGALConfigBuildVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigBuildVersion.cmake
new file mode 100644
index 00000000000..c6ef85cf991
--- /dev/null
+++ b/Installation/lib/cmake/CGAL/CGALConfigBuildVersion.cmake
@@ -0,0 +1 @@
+set(CGAL_BUILD_VERSION 0)
diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
index e0ff35433ce..56f87945869 100644
--- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
@@ -1,6 +1,10 @@
 set(CGAL_MAJOR_VERSION 5)
 set(CGAL_MINOR_VERSION 1)
 set(CGAL_BUGFIX_VERSION 0)
+include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
+if(NOT CMAKE_SCRIPT_MODE_FILE)
+  set(CGAL_BUILD_VERSION ${CGAL_BUILD_VERSION} PARENT_SCOPE)
+endif()
 set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.1-beta2")
 set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
 
diff --git a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
index 16a584ad6eb..aa6d602eb71 100644
--- a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
+++ b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
@@ -182,6 +182,8 @@ string(REPLACE "CGAL_VERSION ${CGAL_VERSION_INPUT}" "CGAL_VERSION ${CGAL_VERSION
 #  update CGAL_VERSION_NR
 if (CGAL_VERSION_NR)
   string(REGEX REPLACE "CGAL_VERSION_NR 10[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]" "CGAL_VERSION_NR ${CGAL_VERSION_NR}" file_content "${file_content}")
+  math(EXPR CGAL_BUILD_VERSION "${CGAL_VERSION_NR} % 10000")
+  file(WRITE ${release_dir}/lib/cmake/CGAL/CGALConfigBuildVersion.cmake "set(CGAL_BUILD_VERSION ${CGAL_BUILD_VERSION})")
 endif()
 file(WRITE ${release_dir}/include/CGAL/version.h "${file_content}")