diff --git a/ChangeLog b/ChangeLog
index abd7586fa6..c5f471af2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+ 2016-03-11 15:11  alexpeshkoff 
+   M examples/dbcrypt/CryptApplication.cpp
+   M examples/dbcrypt/CryptKeyHolder.cpp
+   M examples/dbcrypt/DbCrypt.cpp
+   M examples/interfaces/05.user_metadata.cpp
+   M examples/interfaces/ifaceExamples.h
+Fixed CORE-5134: Samples of dbcrypt-related plugins contain references to internal files
+
+ 2016-03-11 14:10  aafemt 
+   M src/gpre/c_cxx.cpp
+   M src/gpre/int_cxx.cpp
+   M src/gpre/obj_cxx.cpp
+Use public datatype FB_BOOLEAN for preprocessed files. Thanks to Dmitry Yemanov
+
+ 2016-03-11 08:50  dimitr 
+   M src/dsql/ExprNodes.h
+Fixed CORE-5149: LEFT JOIN incorrectly pushes COALESCE into the inner stream causing wrong results.
+
+ 2016-03-11 00:58  asfernandes 
+   M src/common/classes/Hash.cpp
+Fix for clang.
+
  2016-03-10 16:37  dimitr 
    M src/common/classes/Hash.cpp
 This should fix linkage on non-Intel platforms, thanks to Dimitry Sibiryakov.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 736fecfde9..9037383abd 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:32393
+  FORMAL BUILD NUMBER:32397
 */
 
-#define PRODUCT_VER_STRING "4.0.0.32393"
-#define FILE_VER_STRING "WI-T4.0.0.32393"
-#define LICENSE_VER_STRING "WI-T4.0.0.32393"
-#define FILE_VER_NUMBER 4, 0, 0, 32393
+#define PRODUCT_VER_STRING "4.0.0.32397"
+#define FILE_VER_STRING "WI-T4.0.0.32397"
+#define LICENSE_VER_STRING "WI-T4.0.0.32397"
+#define FILE_VER_NUMBER 4, 0, 0, 32397
 #define FB_MAJOR_VER "4"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32393"
+#define FB_BUILD_NO "32397"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index d7231d098a..b91087deb7 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=4
 MinorVer=0
 RevNo=0
-BuildNum=32393
+BuildNum=32397
 
 NowAt=`pwd`
 cd `dirname $0`