diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 31f1c0d708..7be24c5b9d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-03 03:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/dircmd.prg
+    ! small fix in 'DIR <filemask>' DOS like output formatting.
+      Note: this function uses strict DOS like 8.3 file name convention
+            in the output so it will play well with long file names.
+            Maybe we should change the output formatting?
+
 2009-04-03 02:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/hvm.c
   * harbour/source/vm/fm.c
diff --git a/harbour/source/rtl/dircmd.prg b/harbour/source/rtl/dircmd.prg
index d1af8f3d72..96df2c2e2c 100644
--- a/harbour/source/rtl/dircmd.prg
+++ b/harbour/source/rtl/dircmd.prg
@@ -128,8 +128,11 @@ STATIC PROCEDURE PutNormal( aDirEntry )
 
    hb_FNameSplit( aDirEntry[ F_NAME ], NIL, @cName, @cExt )
 
+   /* strict DOS like formatting, it does not play well with long file names
+    * which does not used 8.3 DOS convention
+    */
    QOut( PadR( cName, 8 ) + " " +;
-         PadR( cExt, 3 ) + " " +;
+         PadR( Substr( cExt, 2 ), 3 ) + " " +;
          Str( aDirEntry[ F_SIZE ], 8 ) + "  " +;
          DToC( aDirEntry[ F_DATE ] ) )