diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dcf9cec811..f454bb3288 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-05 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * -debugstub internal switch will now echo the stub source
+      to stdout instead of keeping the temp file around.
+
 2009-06-05 17:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbdefs.h
     * cleanup in some declarations
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 24db53d6c6..d6795edadd 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3096,6 +3096,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
                              '#endif'                                                               + hb_osNewLine() )
             ENDIF
             FClose( fhnd )
+
+            IF hbmk[ _HBMK_lDEBUGSTUB ]
+               OutStd( "C stub dump:" + hb_osNewLine() )
+               OutStd( hb_MemoRead( s_cCSTUB ) )
+            ENDIF
          ELSE
             hbmk_OutErr( hbmk, I_( "Warning: Stub helper .c program couldn't be created." ) )
             IF ! hbmk[ _HBMK_lINC ]
@@ -3640,11 +3645,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       /* Cleanup */
 
       IF ! Empty( s_cCSTUB )
-         IF hbmk[ _HBMK_lDEBUGSTUB ]
-            hbmk_OutStd( hbmk, hb_StrFormat( "Stub kept for debug: %1$s", s_cCSTUB ) )
-         ELSE
-            FErase( s_cCSTUB )
-         ENDIF
+         FErase( s_cCSTUB )
          FErase( FN_DirExtSet( s_cCSTUB, cWorkDir, cObjExt ) )
       ENDIF
       IF ! hbmk[ _HBMK_lINC ] .OR. s_lCLEAN