diff --git a/ChangeLog b/ChangeLog
index c951ce8513..242ff3eb45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+ 2012-11-14 08:14  dimitr 
+   M src/jrd/cmp.cpp
+A more generic solution for CORE-1245: Incorrect column values with outer joins and views. It also fixes CORE-3981: Sub-optimal predicate checking while selecting from a view.
+
+ 2012-11-13 09:38  dimitr 
+   M src/jrd/tra.cpp
+Fixed CORE-3978: Invalid transaction counters may be reported in firebird.log during the sweep.
+
  2012-11-11 15:26  dimitr 
    M src/jrd/jrd.cpp
 Fixed CORE-3977: DELETE FROM MON$STATEMENTS does not interrupt a longish fetch.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 9376517bc2..7e81721f55 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:26556
+  FORMAL BUILD NUMBER:26558
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26556"
-#define FILE_VER_STRING "WI-V2.5.3.26556"
-#define LICENSE_VER_STRING "WI-V2.5.3.26556"
-#define FILE_VER_NUMBER 2, 5, 3, 26556
+#define PRODUCT_VER_STRING "2.5.3.26558"
+#define FILE_VER_STRING "WI-V2.5.3.26558"
+#define LICENSE_VER_STRING "WI-V2.5.3.26558"
+#define FILE_VER_NUMBER 2, 5, 3, 26558
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26556"
+#define FB_BUILD_NO "26558"
 #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 d4e7babbda..40a172d516 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26556
+BuildNum=26558
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds