diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85ef8d06d8..41caf3fa16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ include(cmake/FreecivBuildOptions.cmake)
 # Set some project variables to reuse later
 set(FREECIV21_VERSION_MAJOR 3)
 set(FREECIV21_VERSION_MINOR 0)
-set(FREECIV21_VERSION_PATCH 20210912)
+set(FREECIV21_VERSION_PATCH 20211008)
 set(FREECIV21_VERSION "${FREECIV21_VERSION_MAJOR}.${FREECIV21_VERSION_MINOR}.${FREECIV21_VERSION_PATCH}")
 
 # Set project
diff --git a/fc_version b/fc_version
index 322c9bb976..43def9cba3 100755
--- a/fc_version
+++ b/fc_version
@@ -7,8 +7,8 @@
 
 MAJOR_VERSION="3"
 MINOR_VERSION="0"
-PATCH_VERSION="20210912"
-EMERGENCY_VERSION="6"
+PATCH_VERSION="20211008"
+EMERGENCY_VERSION="8"
 VERSION_LABEL="-alpha"
 
 # 1) Development until MAJOR and MINOR version numbers are
diff --git a/utility/fc_version.h b/utility/fc_version.h
index 6480ddb2f6..0bcec3b029 100644
--- a/utility/fc_version.h
+++ b/utility/fc_version.h
@@ -2,13 +2,13 @@
 
 #define MAJOR_VERSION 3
 #define MINOR_VERSION 0
-#define PATCH_VERSION 20210912
-#define EMERGENCY_VERSION 6
+#define PATCH_VERSION 20211008
+#define EMERGENCY_VERSION 8
 #ifndef VERSION_LABEL
 #define VERSION_LABEL "-alpha"
 #endif
 #ifndef VERSION_STRING
-#define VERSION_STRING "3.0.20210912.6-alpha"
+#define VERSION_STRING "3.0.202110008.8-alpha"
 #endif
 
 #define NETWORK_CAPSTRING "+Freeciv21.21April13"