diff --git a/ChangeLog b/ChangeLog
index 5cc96378ff..62911677a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+ 2010-11-08 19:43  dimitr 
+   M src/jrd/tra.cpp
+Avoid destructing the temporary transaction twice. This is expected to fix the crash reported in CORE-3207.
+
+ 2010-11-08 16:32  dimitr 
+   M src/dsql/dsql.cpp
+Comment.
+
+ 2010-11-08 16:30  dimitr 
+   M src/dsql/dsql.cpp
+Fixed CORE-3029: Bugcheck "Too many savepoints (287)" at rollback after exception at EXECUTE BLOCK with exception handler.
+
+ 2010-11-08 16:17  alexpeshkoff 
+   M src/jrd/svc.cpp
+Backported fix for CORE-3220: isc_info_svc_get_users returns error message in the result cluster
+
+ 2010-11-08 10:34  dimitr 
+   M src/common/classes/alloc.cpp
+Fixed unregistered crash when database pools are being printed into the file. We don't have such code enabled by default, so this isn't going to affect production systems.
+
+ 2010-11-08 10:31  dimitr 
+   M src/jrd/opt.cpp
+Fixed an old error which handles aggregates wrongly. So far it seems harmless for versions prior to v3.0 where it has been fixed, but let's be on the safe side.
+
+ 2010-11-08 10:10  dimitr 
+   M src/jrd/Database.cpp
+   M src/jrd/Database.h
+   M src/jrd/event.cpp
+   M src/jrd/event_proto.h
+   M src/lock/lock.cpp
+   M src/lock/lock_proto.h
+Fixed CORE-3217: Server crashes inside the lock manager when multiple connections attaching/detaching simultaneously.
+
+ 2010-11-08 09:16  dimitr 
+   M src/jrd/jrd.cpp
+Fixed CORE-3218: Statement cancellation request might be silently ignored by the currently running SQL code.
+
+ 2010-11-08 08:48  dimitr 
+   M src/jrd/cch.cpp
+Hopefully, this should fix a (supposedly rare) crash I've seen in the debugger once.
+
+ 2010-11-08 07:22  dimitr 
+   M src/jrd/extds/ExtDS.cpp
+If we swallow the exception, let's zap it inside the status vector as well. This fixes the assertion in the debug build.
+
  2010-11-04 01:10  asfernandes 
    M src/jrd/cmp.cpp
 Fixed CORE-3211 - String truncation occurs when selecting from a view containing NOT IN inside
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index d02042f019..679057025c 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:26114
+  FORMAL BUILD NUMBER:26124
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26114"
-#define FILE_VER_STRING "WI-V2.5.0.26114"
-#define LICENSE_VER_STRING "WI-V2.5.0.26114"
-#define FILE_VER_NUMBER 2, 5, 0, 26114
+#define PRODUCT_VER_STRING "2.5.0.26124"
+#define FILE_VER_STRING "WI-V2.5.0.26124"
+#define LICENSE_VER_STRING "WI-V2.5.0.26124"
+#define FILE_VER_NUMBER 2, 5, 0, 26124
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26114"
+#define FB_BUILD_NO "26124"
 #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 18ebc9e258..dd55d9d03f 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26114
+BuildNum=26124
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds