diff --git a/ChangeLog b/ChangeLog
index b8a2b046ee..0c158ad08b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+ 2011-12-06 13:12  dimitr 
+   M src/jrd/trig.h
+Fixed CORE-3692: Cannot drop a NOT NULL constraint on a field participating in the UNIQUE constraint.
+
+ 2011-12-06 10:00  dimitr 
+   M src/jrd/cmp.cpp
+Fixed CORE-927: Grants don't work for procedures used inside views.
+
  2011-12-05 13:52  hvlad 
    M src/dsql/dsql.cpp
 Fixed bug CORE-3680 : EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 61a090f021..7319c47069 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:26394
+  FORMAL BUILD NUMBER:26396
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26394"
-#define FILE_VER_STRING "WI-V2.5.2.26394"
-#define LICENSE_VER_STRING "WI-V2.5.2.26394"
-#define FILE_VER_NUMBER 2, 5, 2, 26394
+#define PRODUCT_VER_STRING "2.5.2.26396"
+#define FILE_VER_STRING "WI-V2.5.2.26396"
+#define LICENSE_VER_STRING "WI-V2.5.2.26396"
+#define FILE_VER_NUMBER 2, 5, 2, 26396
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26394"
+#define FB_BUILD_NO "26396"
 #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 6f5a76c9e8..0191027376 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26394
+BuildNum=26396
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds