diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index eee88b1229..8344816e23 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-12-05 12:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/tests/cpinfo.prg
+    * small modification for non latin CPs having first lower letter before
+      upper
+    * keep signature for generated CP files as "$Id' + "$" to avoid
+      automatic replacing by SVN
+
 2010-12-05 10:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/codepage/cpcskamc.c
   * harbour/src/codepage/cpskkamc.c
diff --git a/harbour/tests/cpinfo.prg b/harbour/tests/cpinfo.prg
index cfca60d13d..f66c8d3c48 100644
--- a/harbour/tests/cpinfo.prg
+++ b/harbour/tests/cpinfo.prg
@@ -19,7 +19,7 @@
 
 proc main( cdp, info, unicode )
    local cUp, cLo, cUp2, cLo2, cOrd, cOrd2, cOrdMix, cMix, c, i, a
-   local lWarn, lBin, lSort, lEqual, lMixed
+   local lWarn, lBin, lSort, lEqual, lMixed, lIsUp, lIsLo
 
    set alternate to cpinfo.txt additive
    set alternate on
@@ -188,15 +188,23 @@ proc main( cdp, info, unicode )
          cUp2 := substr( cUp, 27 )
          cLo2 := substr( cLo, 27 )
          cOrd2 := ""
+         lIsUp := lIsLo := .f.
          for i := 0 to 255
             c := chr( i )
             if c $ cUp2
-               if ! c $ cOrd2
+               if ! lIsUp
                   cOrd2 += cUp2
+                  lIsUp := .t.
+                  if lIsLo
+                     cOrd2 += cLo2
+                  endif
                endif
             elseif c $ cLo2
-               if ! c $ cOrd2
-                  cOrd2 += cLo2
+               if !lIsLo
+                  if lIsUp
+                     cOrd2 += cLo2
+                  endif
+                  lIsLo := .t.
                endif
             else
                cOrd2 += chr( i )
@@ -407,7 +415,7 @@ static function genCPfile( id, info, unicode, flags, upper, lower, sort, ;
    local cDef
 
    cDef := ;
-      '/*' + EOL + ' * $Id$' + EOL + ' */' + EOL + EOL + ;
+      '/*' + EOL + ' * $Id' + '$' + EOL + ' */' + EOL + EOL + ;
       '/*' + EOL + ;
       ' * Harbour Project source code:' + EOL + ;
       ' * National Collation Support Module ( $1 )' + EOL + ;