diff --git a/ChangeLog b/ChangeLog
index ff57a0917f..5dbd1ae66a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ 2011-03-29 00:57  asfernandes 
+   M extern/btyacc/main.c
+Fixed memory corruption in btyacc code.
+
  2011-03-22 13:14  alexpeshkoff 
    M src/common/classes/alloc.h
    M src/include/fb_exception.h
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 1a367175d5..ca49c5bd44 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:18414 
+  FORMAL BUILD NUMBER:18415 
 */
 
-#define PRODUCT_VER_STRING "2.1.4.18414"
-#define FILE_VER_STRING "WI-V2.1.4.18414"
-#define LICENSE_VER_STRING "WI-V2.1.4.18414"
-#define FILE_VER_NUMBER 2, 1, 4, 18414
+#define PRODUCT_VER_STRING "2.1.4.18415"
+#define FILE_VER_STRING "WI-V2.1.4.18415"
+#define LICENSE_VER_STRING "WI-V2.1.4.18415"
+#define FILE_VER_NUMBER 2, 1, 4, 18415
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "18414"
+#define FB_BUILD_NO "18415"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.1"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index e08d468e86..91d2323c92 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=1
 RevNo=4
-BuildNum=18414
+BuildNum=18415
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds