diff --git a/ChangeLog b/ChangeLog
index 5356d28ac3..c29a9698b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ 2011-04-13 10:28  hvlad 
+   M src/jrd/event.cpp
+Fixed bug CORE-3440 : AV in engine if isc_que_events queued 0 events
+
  2011-04-01 21:07  asfernandes 
    M src/jrd/met.epp
 Fixed CORE-3426 - Inactive system triggers after fix for CORE-3418.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 77d5f84e5c..c41fe34b58 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:18417 
+  FORMAL BUILD NUMBER:18418 
 */
 
-#define PRODUCT_VER_STRING "2.1.4.18417"
-#define FILE_VER_STRING "WI-V2.1.4.18417"
-#define LICENSE_VER_STRING "WI-V2.1.4.18417"
-#define FILE_VER_NUMBER 2, 1, 4, 18417
+#define PRODUCT_VER_STRING "2.1.4.18418"
+#define FILE_VER_STRING "WI-V2.1.4.18418"
+#define LICENSE_VER_STRING "WI-V2.1.4.18418"
+#define FILE_VER_NUMBER 2, 1, 4, 18418
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "18417"
+#define FB_BUILD_NO "18418"
 #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 fda11bbba2..0482900bc5 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=1
 RevNo=4
-BuildNum=18417
+BuildNum=18418
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds