diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1da345cf72..3fd8c0a85c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-17 03:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * source/rtl/fstemp.c
+    ! Fixed temp filename generation in {(linux|bsd)&!owatcom}
+      builds when extension was requested.
+
 2009-02-17 01:50 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbfimage/Makefile
     ! Disabled hbfimage on Linux until we solve the type
diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c
index 0ea1b5860d..b48ed12612 100644
--- a/harbour/source/rtl/fstemp.c
+++ b/harbour/source/rtl/fstemp.c
@@ -153,11 +153,10 @@ static HB_FHANDLE hb_fsCreateTempLow( const BYTE * pszDir, const BYTE * pszPrefi
       if( hb_setGetFileCase() != HB_SET_CASE_LOWER &&
           hb_setGetFileCase() != HB_SET_CASE_UPPER &&
           hb_setGetDirCase() != HB_SET_CASE_LOWER &&
-          hb_setGetDirCase() != HB_SET_CASE_UPPER )
+          hb_setGetDirCase() != HB_SET_CASE_UPPER &&
+          pszExt == NULL )
       {
          hb_strncat( ( char * ) pszName, "XXXXXX", _POSIX_PATH_MAX );
-         if( pszExt )
-            hb_strncat( ( char * ) pszName, ( const char * ) pszExt, _POSIX_PATH_MAX );
          hb_vmUnlock();
          fd = ( HB_FHANDLE ) mkstemp( ( char * ) pszName );
          hb_fsSetIOError( fd != ( HB_FHANDLE ) -1, 0 );