diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c26106a77a..41a63149f8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-15 15:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * source/rtl/hbi18n2.prg
+    ! Minor fix to change dir separators to "/" so that
+      there won't be multiple entries for the same file
+      in mixed environments.
+      (like: '#: src\file.prg:1022 src/file.prg:1022')
+
 2009-05-15 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   + utils/hbmk2/hbmk2.pt_BR.po
   * utils/hbmk2/hbmk2.hbm
diff --git a/harbour/source/rtl/hbi18n2.prg b/harbour/source/rtl/hbi18n2.prg
index da7554e090..4e5fe4c389 100644
--- a/harbour/source/rtl/hbi18n2.prg
+++ b/harbour/source/rtl/hbi18n2.prg
@@ -148,7 +148,7 @@ FUNCTION __I18N_POTARRAYLOAD( cFile, cErrorMsg )
                ELSE
                   aItem[ _I18N_SOURCE ] += " "
                ENDIF
-               aItem[ _I18N_SOURCE ] += ltrim( substr( cLine, 3 ) )
+               aItem[ _I18N_SOURCE ] += strtran( ltrim( substr( cLine, 3 ) ), "\", "/" )
 /*
             ELSEIF cLine = "#,"   // flags
                cLine := ltrim( substr( cLine, 3 ) )