diff --git a/ChangeLog b/ChangeLog
index f2c73f9f6d..0edbea424c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+ 2012-12-03 11:04  dimitr 
+   M src/jrd/btr.cpp
+Yet another complementary bugfix for CORE-4004 that avoids an index root page remaining locked after cooperative GC has been terminated by user.
+
+ 2012-12-03 10:47  dimitr 
+   M src/jrd/err.cpp
+Complementary patch to the prior one. It avoids unnecessary operations (system table lookups) if we don't need index or constraint names to be reported in the error message.
+
+ 2012-12-03 10:44  dimitr 
+   M src/jrd/idx.cpp
+   M src/jrd/nav.cpp
+Fixed one part of CORE-4004: Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests. It's definitely not a good idea to ignore errors coming from inside BTR_key().
+
+ 2012-12-03 10:33  dimitr 
+   M src/jrd/jrd.cpp
+Fixed the partially disabled interruptions, accidentally broken with CORE-3323 in v2.5.1.
+
  2012-11-30 08:12  hvlad 
    M src/jrd/dpm.epp
 Fixed bug CORE-4002 : Error message "index unexpectedly deleted" in database trigger on commit transaction
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 9602ed7627..c110ee3e10 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:26571
+  FORMAL BUILD NUMBER:26575
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26571"
-#define FILE_VER_STRING "WI-V2.5.3.26571"
-#define LICENSE_VER_STRING "WI-V2.5.3.26571"
-#define FILE_VER_NUMBER 2, 5, 3, 26571
+#define PRODUCT_VER_STRING "2.5.3.26575"
+#define FILE_VER_STRING "WI-V2.5.3.26575"
+#define LICENSE_VER_STRING "WI-V2.5.3.26575"
+#define FILE_VER_NUMBER 2, 5, 3, 26575
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26571"
+#define FB_BUILD_NO "26575"
 #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 5c01350033..a6a2e51993 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26571
+BuildNum=26575
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds