diff --git a/ChangeLog b/ChangeLog
index 9154a2c019..dacf2e09df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+ 2011-03-17 11:17  hvlad 
+   M src/jrd/idx.cpp
+Fixed bug CORE-3394 : Failed attempt to violate unique constraint could leave unneeded "lock conflict" error in status-vector.
+Backported more conservative version of patch
+
  2011-03-16 20:44  hvlad 
    M src/dsql/dsql.cpp
 Fixed bug CORE-3389 : isc_dsql_exec_immed2 with zero transaction handle could lead to a BUGCHECK(147)
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index d82b47ce4b..59ab5f22de 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:26238
+  FORMAL BUILD NUMBER:26239
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26238"
-#define FILE_VER_STRING "WI-V2.5.1.26238"
-#define LICENSE_VER_STRING "WI-V2.5.1.26238"
-#define FILE_VER_NUMBER 2, 5, 1, 26238
+#define PRODUCT_VER_STRING "2.5.1.26239"
+#define FILE_VER_STRING "WI-V2.5.1.26239"
+#define LICENSE_VER_STRING "WI-V2.5.1.26239"
+#define FILE_VER_NUMBER 2, 5, 1, 26239
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26238"
+#define FB_BUILD_NO "26239"
 #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 e1f0f114a5..a98007e07d 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26238
+BuildNum=26239
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds