diff --git a/setupBuildNum.sh b/setupBuildNum.sh
index fd1cde9e0d..df1b760ed4 100644
--- a/setupBuildNum.sh
+++ b/setupBuildNum.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+v41Filter="--after=05.05.2021"
 v40Filter="--after=28.02.2016"
 v30Offset=15471
 v25Offset=13822
@@ -40,7 +41,8 @@ fi
 
 git fetch --all
 
-processBranch master 0 $v40Filter
+processBranch master 0 $v41Filter
+processBranch v4.0-release 0 $v40Filter
 processBranch B3_0_Release $v30Offset
 processBranch B2_5_Release $v25Offset
 
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index ef78ccb5f2..2401272ad6 100644
--- a/src/jrd/build_no.h
+++ b/src/jrd/build_no.h
@@ -6,13 +6,13 @@
   FORMAL BUILD NUMBER:2468
 */
 
-#define PRODUCT_VER_STRING "4.0.0.2468"
-#define FILE_VER_STRING "WI-V4.0.0.2468"
-#define LICENSE_VER_STRING "WI-V4.0.0.2468"
-#define FILE_VER_NUMBER 4, 0, 0, 2468
+#define PRODUCT_VER_STRING "4.1.0.2468"
+#define FILE_VER_STRING "WI-T4.1.0.2468"
+#define LICENSE_VER_STRING "WI-T4.1.0.2468"
+#define FILE_VER_NUMBER 4, 1, 0, 2468
 #define FB_MAJOR_VER "4"
-#define FB_MINOR_VER "0"
+#define FB_MINOR_VER "1"
 #define FB_REV_NO "0"
 #define FB_BUILD_NO "2468"
-#define FB_BUILD_TYPE "V"
-#define FB_BUILD_SUFFIX "Firebird 4.0 Release Candidate 1"
+#define FB_BUILD_TYPE "T"
+#define FB_BUILD_SUFFIX "Firebird 4.1 Initial"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 63da35ec11..361f43c227 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -5,9 +5,9 @@
 
 BuildVersion="$Id: writeBuildNum.sh,v 1.28732 2010/05/29 13:12:08 fsg Exp $"
 
-BuildType=V
+BuildType=T
 MajorVer=4
-MinorVer=0
+MinorVer=1
 RevNo=0
 BuildNum=2468
 
@@ -20,9 +20,9 @@ Root=`dirname $Root`
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
-SuffixKind="Release Candidate"
-SuffixVer="1"
-BuildSuffix="Firebird 4.0"
+SuffixKind="Initial"
+SuffixVer=""
+BuildSuffix="Firebird $MajorVer.$MinorVer"
 [ "$SuffixKind" = "" ] || BuildSuffix="$BuildSuffix $SuffixKind"
 [ "$SuffixVer" = "" ] || BuildSuffix="$BuildSuffix $SuffixVer"
 FIREBIRD_PACKAGE_VERSION="$SuffixKind$SuffixVer"
@@ -30,7 +30,7 @@ FIREBIRD_PACKAGE_VERSION="$SuffixKind$SuffixVer"
 PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum"
 else
 # Special builds (daily snapshots, etc)
-BuildSuffix="Firebird 4.0 $SPECIAL_BUILD_SUFFIX"
+BuildSuffix="Firebird $MajorVer.$MinorVer $SPECIAL_BUILD_SUFFIX"
 FIREBIRD_PACKAGE_VERSION=$SPECIAL_BUILD_SUFFIX
 PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum-$SPECIAL_BUILD_SUFFIX"
 fi