diff --git a/harbour/.gitattributes b/harbour/.gitattributes
index 3154505ab3..1dfbe24118 100644
--- a/harbour/.gitattributes
+++ b/harbour/.gitattributes
@@ -1,3 +1,5 @@
+ChangeLog.txt ident
+
 # Default
 *         text=auto
 
diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index ba07f1731e..e3910ca859 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,16 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-15 11:02 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * .gitattributes
+    + enabled keyword expansion for ChangeLog.txt
+
+  * README.txt
+    - deleted svn header
+
+  * tests/setkeys.prg
+    * cleanups
+
 2013-03-15 04:18 UTC+0100 Viktor Szakats (harbour syenar.net)
   + tests/fwdref.prg
     + added TOFIX and demonstration for this bug by Kevin Carmody:
diff --git a/harbour/README.txt b/harbour/README.txt
index 73403af35a..4402b0a9c4 100644
--- a/harbour/README.txt
+++ b/harbour/README.txt
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 WELCOME TO HARBOUR
 ==================
 
diff --git a/harbour/tests/setkeys.prg b/harbour/tests/setkeys.prg
index 81ce5c1e3c..6f8c3b592b 100644
--- a/harbour/tests/setkeys.prg
+++ b/harbour/tests/setkeys.prg
@@ -58,12 +58,14 @@ PROCEDURE Main()
    LOCAL alpha, bravo, charlie, k
    LOCAL F8Active := .T.
 
+   Set( _SET_DATEFORMAT, "yyyy-mm-dd" )
+
    CLS
 
-   @ 2, 2 SAY "Press F10 to popup alert box of current get, not active if empty"
-   @ 3, 2 SAY "Press F9 to disable all setkeys, except F9 to restore (uses SetKeySave())"
-   @ 4, 2 SAY "Press F8 to test setkey w/ array, SetKeyCheck(), and SetKeyGet()"
-   @ 5, 2 SAY "Press F7 to active/deactive F8"
+   @ 2, 2 SAY "Press <F10> to popup alert box of current get, not active if empty"
+   @ 3, 2 SAY "Press <F9> to disable all setkeys, except <F9> to restore (uses hb_SetKeySave())"
+   @ 4, 2 SAY "Press <F8> to test setkey w/ array, hb_SetKeyCheck(), and hb_SetKeyGet()"
+   @ 5, 2 SAY "Press <F7> to active/deactive <F8>"
 
    alpha   := "alpha    "
    bravo   := 123
@@ -74,7 +76,7 @@ PROCEDURE Main()
    @ 12, 10 GET charlie
 
    SetKey( K_F10, {|| Alert( Transform( GetActive():varGet(), NIL ) ) }, ;
-      {|| ! Empty( GetActive():VarGet() ) } )  /* :buffer */
+      {|| ! Empty( GetActive():varGet() ) } )
    SetKey( K_F9, {|| k := hb_SetKeySave( NIL ), ;
       SetKey( K_F9, {|| hb_SetKeySave( k ) } ) } )
    SetKey( K_F8, {|| SubMain() }, {|| F8Active } )
@@ -89,11 +91,12 @@ STATIC PROCEDURE SubMain()
 
    LOCAL n
    LOCAL bF8Action, bF8Active
+   LOCAL aKeyArray := { hb_keyCode( "1" ), hb_keyCode( "2" ), hb_keyCode( "4" ), hb_keyCode( "5" ) }
 
    bF8Action := hb_SetKeyGet( K_F8, @bF8Active )
    SetKey( K_F8, NIL )
 
-   hb_SetKeyArray( { 49, 50, 52, 53 }, {| x | QOut( hb_keyChar( x ) ) } )
+   hb_SetKeyArray( aKeyArray, {| x | QOut( hb_keyChar( x ) ) } )
    DO WHILE ( n := Inkey( 0 ) ) != K_ESC
       IF hb_SetKeyCheck( n, ProcName(), ProcLine(), ReadVar() )
          ?? " hit hot"
@@ -103,20 +106,7 @@ STATIC PROCEDURE SubMain()
       ENDIF
    ENDDO
 
-   hb_SetKeyArray( { 49, 50, 52, 53 }, NIL )
+   hb_SetKeyArray( aKeyArray, NIL )
    SetKey( K_F8, bF8Action, bF8Active )
 
    RETURN
-
-PROCEDURE Help( cProc, nLine, cVar )
-
-   LOCAL nX := Col(), nY := Row()
-
-   @ 19, 19 SAY "Pcount: " ; ?? PCount()
-   @ 20, 10 SAY "Proc  : " ; ?? cProc
-   @ 21, 10 SAY "Line  : " ; ?? nLine
-   @ 22, 10 SAY "Var   : " ; ?? cVar
-
-   SetPos( nX, nY )
-
-   RETURN