diff --git a/doc/WhatsNew b/doc/WhatsNew
index fb1175ccb9..808b634b61 100644
--- a/doc/WhatsNew
+++ b/doc/WhatsNew
@@ -162,6 +162,11 @@
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Improvement CORE-1889
+        Security database has FW mode OFF, making it corrupted under some circumstances
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
 
   ***************************
   * v2.1 Final
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 5eecd75a77..82e4d70408 100644
--- a/src/jrd/build_no.h
+++ b/src/jrd/build_no.h
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:17798 
+  FORMAL BUILD NUMBER:17910 
 */
 
-#define PRODUCT_VER_STRING "2.1.0.17798"
-#define FILE_VER_STRING "WI-T2.1.0.17798"
-#define LICENSE_VER_STRING "WI-T2.1.0.17798"
-#define FILE_VER_NUMBER 2, 1, 0, 17798
+#define PRODUCT_VER_STRING "2.1.1.17910"
+#define FILE_VER_STRING "WI-T2.1.1.17910"
+#define LICENSE_VER_STRING "WI-T2.1.1.17910"
+#define FILE_VER_NUMBER 2, 1, 1, 17910
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
-#define FB_REV_NO "0"
-#define FB_BUILD_NO "17798"
+#define FB_REV_NO "1"
+#define FB_BUILD_NO "17910"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.1"
diff --git a/src/jrd/isc_version.h b/src/jrd/isc_version.h
index af2ec6803c..ccdf93b496 100644
--- a/src/jrd/isc_version.h
+++ b/src/jrd/isc_version.h
@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-T6.3.4.17798"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 17798
+#define ISC_FILE_VER_STRING "WI-T6.3.4.17910"
+#define ISC_FILE_VER_NUMBER 6, 3, 4, 17910
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 1542120bea..4c28dc38a1 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -3,13 +3,13 @@
 # This file is used both to rebuild the header file and to set the 
 # environment variables on the config call
 
-BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.6 2008-04-09 10:28:22 dimitr Exp $"
+BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.7 2008-05-12 17:00:13 dimitr Exp $"
 
 BuildType=V
 MajorVer=2
 MinorVer=1
-RevNo=0
-BuildNum=17798
+RevNo=1
+BuildNum=17910
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds