diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 24e4a6d548..23d5ad6f7f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-18 02:07 UTC+0100 Viktor Szakats (vszakats syenar.net)
+  - doc/readme.txt
+  + doc/welcome.txt
+  * doc/Makefile
+  * package/mpkg_win.nsi
+  * package/winuni/mpkg_win_uni.nsi
+    * making room for "real" readme.txt
+
+  * tests/transtst.prg
+    * minor
+
 2012-11-18 02:02 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbgd/tests/test_out.prg
   * contrib/hbmisc/spd.c
diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile
index 87ab0fae2e..62285f4b6c 100644
--- a/harbour/doc/Makefile
+++ b/harbour/doc/Makefile
@@ -26,7 +26,7 @@ DOC_FILES := \
    pcode.txt \
    pp.txt \
    pragma.txt \
-   readme.txt \
+   welcome.txt \
    statics.txt \
    todo.txt \
    tracing.txt \
diff --git a/harbour/doc/readme.txt b/harbour/doc/welcome.txt
similarity index 100%
rename from harbour/doc/readme.txt
rename to harbour/doc/welcome.txt
diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi
index 48baa6d534..d00e8e7dd9 100644
--- a/harbour/package/mpkg_win.nsi
+++ b/harbour/package/mpkg_win.nsi
@@ -19,7 +19,7 @@
   !define MUI_HEADERIMAGE
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
+  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\welcome.txt"
   !define MUI_ICON "harb_win.ico"
   !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico"
 
diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi
index c22400ec01..3482d0843a 100644
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -18,7 +18,7 @@ SetCompressor /solid lzma
   !define MUI_HEADERIMAGE
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
+  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\welcome.txt"
   !define MUI_ICON "..\harb_win.ico"
   !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico"
 
diff --git a/harbour/tests/transtst.prg b/harbour/tests/transtst.prg
index 1b4731059e..634a339e8b 100644
--- a/harbour/tests/transtst.prg
+++ b/harbour/tests/transtst.prg
@@ -311,7 +311,7 @@ PROC tofix()
 
 #ifndef __HARBOUR__
 
-FUNC SToD( s )
+FUNCTION SToD( s )
 
    LOCAL cDf := Set( _SET_DATEFORMAT, "YYYY/MM/DD" ), dt