diff --git a/cmake/modules/version.cmake b/cmake/modules/version.cmake
index d35b3be0623..e1ddf10c4c7 100644
--- a/cmake/modules/version.cmake
+++ b/cmake/modules/version.cmake
@@ -63,7 +63,7 @@ foreach(type file IN ZIP_LISTS VERSION_TYPE VERSION_FILE)
   string(REGEX MATCH "VERSION_TWEAK = ([0-9]*)" _ ${ver})
   set(${type}_VERSION_TWEAK ${CMAKE_MATCH_1})
 
-  string(REGEX MATCH "EXTRAVERSION = ([a-z0-9]*)" _ ${ver})
+  string(REGEX MATCH "EXTRAVERSION = ([a-z0-9\.]*)" _ ${ver})
   set(${type}_VERSION_EXTRA ${CMAKE_MATCH_1})
 
   # Validate all version fields fit in a single byte
diff --git a/doc/build/version/index.rst b/doc/build/version/index.rst
index 1725e1a6646..773b1988f9a 100644
--- a/doc/build/version/index.rst
+++ b/doc/build/version/index.rst
@@ -39,19 +39,19 @@ field to a single byte (note that there may be further restrictions depending up
 is used for, e.g. bootloaders might only support some of these fields or might place limits on the
 maximum values of fields):
 
-+---------------+----------------------------------------+
-| Field         | Data type                              |
-+---------------+----------------------------------------+
-| VERSION_MAJOR | Numerical (0-255)                      |
-+---------------+----------------------------------------+
-| VERSION_MINOR | Numerical (0-255)                      |
-+---------------+----------------------------------------+
-| PATCHLEVEL    | Numerical (0-255)                      |
-+---------------+----------------------------------------+
-| VERSION_TWEAK | Numerical (0-255)                      |
-+---------------+----------------------------------------+
-| EXTRAVERSION  | Alphanumerical (Lowercase a-z and 0-9) |
-+---------------+----------------------------------------+
++---------------+-------------------------------------------+
+| Field         | Data type                                 |
++---------------+-------------------------------------------+
+| VERSION_MAJOR | Numerical (0-255)                         |
++---------------+-------------------------------------------+
+| VERSION_MINOR | Numerical (0-255)                         |
++---------------+-------------------------------------------+
+| PATCHLEVEL    | Numerical (0-255)                         |
++---------------+-------------------------------------------+
+| VERSION_TWEAK | Numerical (0-255)                         |
++---------------+-------------------------------------------+
+| EXTRAVERSION  | Alphanumerical (Lowercase a-z and 0-9, .) |
++---------------+-------------------------------------------+
 
 When an application is configured using CMake, the version file will be automatically processed,
 and will be checked automatically each time the version is changed, so CMake does not need to be