diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ea34356785..a9d27f9758 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2006-08-04 16:00 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)
+   * harbour/source/rtl/fstemp.c
+     + Implemented prefix parameter in temp file generation for Win32.
+
 2006-08-04 15:24 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)
    * harbour/include/hbundoc.api
      + Added _tctemp() undocumented call.
diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c
index 4ce4a26386..8f17557f96 100644
--- a/harbour/source/rtl/fstemp.c
+++ b/harbour/source/rtl/fstemp.c
@@ -75,9 +75,6 @@ static BOOL hb_fsTempName( BYTE * pszBuffer, const BYTE * pszDir, const BYTE * p
 
    char cTempDir[ _POSIX_PATH_MAX + 1 ];
 
-   /* TODO: Implement this: */
-   HB_SYMBOL_UNUSED( pszPrefix );
-
    if ( pszDir != NULL && pszDir[0] != '\0' )
    {
       strncpy( (char *) cTempDir, (const char *) pszDir, _POSIX_PATH_MAX );
@@ -92,7 +89,7 @@ static BOOL hb_fsTempName( BYTE * pszBuffer, const BYTE * pszDir, const BYTE * p
    }
    cTempDir[ _POSIX_PATH_MAX ] = '\0';
 
-   fResult = GetTempFileName( cTempDir, "xht", 0, (char *) pszBuffer );
+   fResult = GetTempFileName( cTempDir, ( const char * ) ( ( pszPrefix == NULL ) ? "hb" : pszPrefix ), 0, ( char * ) pszBuffer );
 
 #else
 
@@ -256,7 +253,6 @@ HB_EXPORT FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix,
 
 #ifdef HB_EXTENSION
 
-
 HB_FUNC( HB_FTEMPCREATE )
 {
    BYTE szName[ _POSIX_PATH_MAX + 1 ];