diff --git a/ChangeLog b/ChangeLog
index 0c08fec9af..0f8e42e212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ 2012-12-20 15:28  alexpeshkoff 
+   M src/burp/burp.cpp
+Backported fix for CORE-3995: Slight problem with GBAK parameter checking
+
  2012-12-18 19:35  dimitr 
    M src/jrd/cch.cpp
 Slightly refactored the error handling.
@@ -72,7 +76,7 @@ Review and testing would be appreciated, especially in regard to EXE_assignment.
    M src/jrd/cch.cpp
    M src/jrd/jrd.cpp
    M src/jrd/jrd.h
-Alternative fix for CORE-3034 (Bugche?\209?\129k 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
+Alternative fix for CORE-3034 (Bugcheсk 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
 
  2012-12-03 11:04  dimitr 
    M src/jrd/btr.cpp
@@ -814,7 +818,7 @@ Backported fix for CORE-3736: WITH LOCK clause is allowed for users with read-on
    M src/qli/dtr.cpp
    M src/qli/dtr.h
    M src/qli/meta.epp
-Stop db triggers in qli, from Herr Schlottmann-G?\195?\182dde
+Stop db triggers in qli, from Herr Schlottmann-Gödde
 
  2012-01-18 12:05  alexpeshkoff 
    M src/burp/restore.epp
@@ -20651,7 +20655,7 @@ Fixed CORE-1842 - DEFAULT values are unnecessary evaluated.
  2008-11-29 18:47  asfernandes 
    M src/jrd/DataTypeUtil.cpp
    M src/jrd/DataTypeUtil.h
-Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation).
+Fixed CORE-2019 – UTF-8 conversion error (string truncation).
 
  2008-11-28 18:49  alexpeshkoff 
    M src/common/classes/SafeArg.cpp
@@ -23003,7 +23007,7 @@ Fixed bug CORE-1970 : Lock conversion denied (215) error may occurs
 
  2008-07-16 14:16  asfernandes 
    M src/jrd/idx.cpp
-Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint
+Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint
 
  2008-07-16 13:55  asfernandes 
    M src/jrd/Optimizer.cpp
@@ -24011,7 +24015,7 @@ Constness and some unsigned values.
  2008-06-14 02:17  asfernandes 
    M doc/sql.extensions/README.similar_to.txt
    M src/jrd/SimilarToMatcher.h
-1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized.
+1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized.
 2) Improve the documentation after some questions from Claudio.
 
  2008-06-13 14:01  dimitr 
@@ -36279,7 +36283,7 @@ Fixed CORE-1253 - LIST(DISTINCT) concatenate VARCHAR values as CHAR
 
  2007-05-09 15:23  asfernandes 
    M doc/sql.extensions/README.list
-Updated LIST documentation - thanks to Maycon Ferra?\195?\167a
+Updated LIST documentation - thanks to Maycon Ferraça
 
  2007-05-09 02:03  asfernandes 
    M src/burp/burp.cpp
@@ -38230,7 +38234,7 @@ Patch by Damyan Ivanov - accept localhost connections without /etc/host.equiv
 
  2007-03-22 13:07  asfernandes 
    M doc/sql.extensions/README.context_variables2
-Document the new context variable - thanks to Maicon Ferra?\195?\167a
+Document the new context variable - thanks to Maicon Ferraça
 
  2007-03-22 12:53  dimitr 
    M src/dsql/pass1.cpp
@@ -39907,7 +39911,7 @@ Misc.
 
  2006-12-14 10:30  asfernandes 
    M doc/sql.extensions/README.returning
-Correction - thanks to Maycon Ferra?\195?\167a
+Correction - thanks to Maycon Ferraça
 
  2006-12-14 09:14  dimitr 
    A doc/README.monitoring_tables
@@ -41351,7 +41355,7 @@ Fixed the project files.
 
  2006-10-10 03:53  asfernandes 
    M src/jrd/jrd.cpp
-Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling
+Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling
 
  2006-10-10 03:39  asfernandes 
    M src/jrd/os/posix/isc_ipc.cpp
@@ -41700,7 +41704,7 @@ MERGE statement
 
  2006-09-13 12:59  asfernandes 
    M src/dsql/pass1.cpp
-Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel
+Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel
 
  2006-09-12 16:31  asfernandes 
    M src/jrd/opt.cpp
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index c677e33bb7..d5636d2308 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:26587
+  FORMAL BUILD NUMBER:26588
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26587"
-#define FILE_VER_STRING "WI-V2.5.3.26587"
-#define LICENSE_VER_STRING "WI-V2.5.3.26587"
-#define FILE_VER_NUMBER 2, 5, 3, 26587
+#define PRODUCT_VER_STRING "2.5.3.26588"
+#define FILE_VER_STRING "WI-V2.5.3.26588"
+#define LICENSE_VER_STRING "WI-V2.5.3.26588"
+#define FILE_VER_NUMBER 2, 5, 3, 26588
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26587"
+#define FB_BUILD_NO "26588"
 #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 50ad6d35f1..53c038b3ad 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26587
+BuildNum=26588
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds