diff --git a/ChangeLog b/ChangeLog
index cd65ae0ce1..0f57d72a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+ 2012-06-20 18:57  hvlad 
+   M src/jrd/cch.cpp
+Backported fix from v3 : backup state lock should be released at latch timeout, else lock state accounting becomes inconsistent.
+
+ 2012-06-20 11:56  alexpeshkoff 
+   M doc/README.services_extension
+   M src/burp/burp.cpp
+   M src/burp/burp.h
+   M src/burp/mvol.cpp
+   M src/burp/spit.cpp
+   M src/burp/spit.h
+   M src/burp/std_desc.h
+   M src/common/UtilSvc.cpp
+   M src/common/UtilSvc.h
+   M src/include/consts_pub.h
+   M src/include/gen/msgs.h
+   M src/jrd/svc.cpp
+   M src/jrd/svc.h
+   M src/lock/lock.cpp
+   M src/msgs/messages2.sql
+   M src/utilities/fbsvcmgr.cpp
+Backported implementation of CORE-2666: Make it possible to use API to do remote backups/restores
+
+ 2012-06-20 09:32  paulbeach 
+   M builds/posix/postfix.darwin
+Copy libfbclient.dylib to Firebird SuperServer Framework Libraries to support the ODBC driver
+
  2012-06-10 13:22  dimitr 
    M src/jrd/Optimizer.cpp
 Optimizer level solution for CORE-2790/CORE-3449.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 2c8aaad5e8..265721133e 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:26496
+  FORMAL BUILD NUMBER:26499
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26496"
-#define FILE_VER_STRING "WI-V2.5.2.26496"
-#define LICENSE_VER_STRING "WI-V2.5.2.26496"
-#define FILE_VER_NUMBER 2, 5, 2, 26496
+#define PRODUCT_VER_STRING "2.5.2.26499"
+#define FILE_VER_STRING "WI-V2.5.2.26499"
+#define LICENSE_VER_STRING "WI-V2.5.2.26499"
+#define FILE_VER_NUMBER 2, 5, 2, 26499
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26496"
+#define FB_BUILD_NO "26499"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 4f1ee72fa3..4030e985ce 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26496
+BuildNum=26499
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds