diff --git a/ChangeLog b/ChangeLog
index d68b2e15e0..128bde7304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+ 2010-10-09 18:39  asfernandes 
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/Nodes.h
+   M src/dsql/Visitors.h
+   M src/dsql/gen.cpp
+   M src/dsql/make.cpp
+   M src/dsql/node.h
+   M src/dsql/parse.y
+   M src/dsql/pass1.cpp
+   M src/jrd/Optimizer.cpp
+   M src/jrd/cmp.cpp
+   M src/jrd/evl.cpp
+   M src/jrd/exe.h
+   M src/jrd/nod.h
+   M src/jrd/opt.cpp
+   M src/jrd/par.cpp
+   M src/misc/blrtable.cpp
+1) Refactored LOWER, UPPER and TRIM.
+2) Fixed CORE-3174 - Expression index with TRIM may lead to incorrect indexed lookup
+
  2010-10-09 01:57  asfernandes 
    M src/dsql/AggNodes.cpp
    M src/dsql/AggNodes.h
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 1c7eba8bd4..a863a754d3 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:28757
+  FORMAL BUILD NUMBER:28758
 */
 
-#define PRODUCT_VER_STRING "3.0.0.28757"
-#define FILE_VER_STRING "WI-T3.0.0.28757"
-#define LICENSE_VER_STRING "WI-T3.0.0.28757"
-#define FILE_VER_NUMBER 3, 0, 0, 28757
+#define PRODUCT_VER_STRING "3.0.0.28758"
+#define FILE_VER_STRING "WI-T3.0.0.28758"
+#define LICENSE_VER_STRING "WI-T3.0.0.28758"
+#define FILE_VER_NUMBER 3, 0, 0, 28758
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "28757"
+#define FB_BUILD_NO "28758"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index b986754dc8..24c38d6be7 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=28757
+BuildNum=28758
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds