diff --git a/VERSION b/VERSION
index 51a207e3bb9..11cb888fc0f 100644
--- a/VERSION
+++ b/VERSION
@@ -2,4 +2,4 @@ VERSION_MAJOR = 1
 VERSION_MINOR = 10
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = rc1
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 7af35b7d84f..3b399a2aa86 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -13,7 +13,7 @@ set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_1})
 string(REGEX MATCH "VERSION_TWEAK = ([0-9]*)" _ ${ver})
 set(PROJECT_VERSION_TWEAK ${CMAKE_MATCH_1})
 
-string(REGEX MATCH "EXTRAVERSION = (.*)" _ ${ver})
+string(REGEX MATCH "EXTRAVERSION = ([a-z0-9]*)" _ ${ver})
 set(PROJECT_VERSION_EXTRA ${CMAKE_MATCH_1})
 
 
@@ -42,5 +42,5 @@ unset(PATCH)
 set(KERNEL_VERSION_MAJOR      ${PROJECT_VERSION_MAJOR})
 set(KERNEL_VERSION_MINOR      ${PROJECT_VERSION_MINOR})
 set(KERNEL_PATCHLEVEL         ${PROJECT_VERSION_PATCH})
-set(KERNEL_VERSION_STRING     "\"${PROJECT_VERSION}\"")
+set(KERNEL_VERSION_STRING     "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${PROJECT_VERSION_EXTRA}\"")