diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4fd562fea5..3eb2a45c3f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,25 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-16 16:12 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * bin/3rdpatch.hb
+    * COPYING -> COPYING.txt
+
+  * src/common/hbver.c
+    * 'Rev.' -> 'r' in VERSION() string. This affects
+      all utility banners
+
+  * utils/hbi18n/hbi18n.prg
+    * assemble version display instead of assumptions
+      about VERSION() content
+
+  * utils/hbmk2/hbmk2.*.po
+  * utils/hbmk2/hbmk2.prg
+    * cleanups
+
+  * tests/cblock.prg -> tests/codebl2.prg
+    * rename
+
 2013-03-16 13:49 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     * 'Rev.' -> 'r' in hbmk2/hbrun header
diff --git a/bin/3rdpatch.hb b/bin/3rdpatch.hb
index 014d048e35..2187e87a48 100755
--- a/bin/3rdpatch.hb
+++ b/bin/3rdpatch.hb
@@ -4,7 +4,7 @@
  * 3rdpatch - a tool to help update 3rd party components while keeping local fixes
  *
  * Copyright 2010, 2011 Tamas TEVESZ
- * See COPYING for licensing terms.
+ * See COPYING.txt for licensing terms.
  *
  * 1. CONFIGURATION
  * ----------------
diff --git a/src/common/hbver.c b/src/common/hbver.c
index 643e36511c..bc27273b04 100644
--- a/src/common/hbver.c
+++ b/src/common/hbver.c
@@ -1075,7 +1075,7 @@ char * hb_verHarbour( void )
    HB_TRACE( HB_TR_DEBUG, ( "hb_verHarbour()" ) );
 
    pszVersion = ( char * ) hb_xgrab( 80 );
-   hb_snprintf( pszVersion, 80, "Harbour %d.%d.%d%s (Rev. %d)",
+   hb_snprintf( pszVersion, 80, "Harbour %d.%d.%d%s (r%d)",
                 HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS,
                 hb_verRevision() );
 
diff --git a/tests/cblock.prg b/tests/codebl2.prg
similarity index 100%
rename from tests/cblock.prg
rename to tests/codebl2.prg
diff --git a/utils/hbi18n/hbi18n.prg b/utils/hbi18n/hbi18n.prg
index 200f62153a..a0378e67fb 100644
--- a/utils/hbi18n/hbi18n.prg
+++ b/utils/hbi18n/hbi18n.prg
@@ -47,6 +47,7 @@
  */
 
 #include "hbgtinfo.ch"
+#include "hbver.ch"
 #include "directry.ch"
 
 #define _HB_I18N_MERGE  1
@@ -153,8 +154,12 @@ PROCEDURE Main( ... )
    RETURN
 
 STATIC FUNCTION HBRawVersion()
-
-   RETURN StrTran( Version(), "Harbour " )
+   RETURN hb_StrFormat( "%d.%d.%d%s (r%d)", ;
+      hb_Version( HB_VERSION_MAJOR ), ;
+      hb_Version( HB_VERSION_MINOR ), ;
+      hb_Version( HB_VERSION_RELEASE ), ;
+      hb_Version( HB_VERSION_STATUS ), ;
+      hb_Version( HB_VERSION_REVISION ) )
 
 STATIC PROCEDURE Logo()
 
diff --git a/utils/hbmk2/hbmk2.es_PE.po b/utils/hbmk2/hbmk2.es_PE.po
index 1dd165b858..5e1a1618aa 100644
--- a/utils/hbmk2/hbmk2.es_PE.po
+++ b/utils/hbmk2/hbmk2.es_PE.po
@@ -1,5 +1,5 @@
 #
-# This file is generated by Harbour 3.2.0dev (Rev. 17557)
+# This file is generated by Harbour 3.2.0dev (r17557)
 #
 
 #, c-format
diff --git a/utils/hbmk2/hbmk2.hu_HU.po b/utils/hbmk2/hbmk2.hu_HU.po
index b713b4c1d1..cc711b2a63 100644
--- a/utils/hbmk2/hbmk2.hu_HU.po
+++ b/utils/hbmk2/hbmk2.hu_HU.po
@@ -1,5 +1,5 @@
 #
-# This file is generated by Harbour 3.2.0dev (Rev. 17557)
+# This file is generated by Harbour 3.2.0dev (r17557)
 #
 
 #: hbmk2.prg:3992 hbmk2.prg:5469 hbmk2.prg:6042
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index c65d0b3dbc..00e48e0f79 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -1,6 +1,6 @@
 /*
  * Harbour Project source code:
- * Harbour Make (alias hbmk/hbmk2)
+ * Harbour Make (alias hbmk/hbmk2/hbrun)
  *
  * Copyright 1999-2013 Viktor Szakats (harbour syenar.net)
  * www - http://harbour-project.org
diff --git a/utils/hbmk2/hbmk2.pt_BR.po b/utils/hbmk2/hbmk2.pt_BR.po
index be3801cc5f..3759ca748c 100644
--- a/utils/hbmk2/hbmk2.pt_BR.po
+++ b/utils/hbmk2/hbmk2.pt_BR.po
@@ -1,5 +1,5 @@
 #
-# This file is generated by Harbour 3.2.0dev (Rev. 17557)
+# This file is generated by Harbour 3.2.0dev (r17557)
 #
 
 #, c-format