diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c03cff4fa3..0dac3cf421 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-22 12:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    * Changed to not try to create an .hbl automatically if no
+      explicit .hbl file is passed or -hbl option used. Instead
+      now -hbl= or -hbl option will force creation of an .hbl
+      file with an automatic name.
+
 2009-04-22 11:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed regression in handling .c stub after recent changes.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index eea7eedeac..bb939cc340 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1039,10 +1039,11 @@ FUNCTION hbmk( aArgs )
 
       CASE Left( cParamL, 5 ) == "-hbl="
 
-         cParam := SubStr( cParam, 6 )
-         IF ! Empty( cParam )
-            s_cHBL := PathSepToTarget( cParam )
-         ENDIF
+         s_cHBL := PathSepToTarget( SubStr( cParam, 6 ) )
+
+      CASE Left( cParamL, 5 ) == "-hbl"
+
+         s_cHBL := ""
 
       CASE Left( cParamL, 6 ) == "-main="
 
@@ -2580,7 +2581,7 @@ FUNCTION hbmk( aArgs )
          s_aRESSRC_TODO := s_aRESSRC
       ENDIF
 
-      IF Len( s_aPO ) > 0 .AND. ! s_lCLEAN
+      IF Len( s_aPO ) > 0 .AND. s_cHBL != NIL .AND. ! s_lCLEAN
          MakeHBL( s_aPO, s_cHBL, s_aLNG )
       ENDIF
 
@@ -4951,7 +4952,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  -workdir=<dir>     working directory for incremental build mode" ,;
       "                     (default: arch/comp)" ,;
       "" ,;
-      "  -hbl=<output>      output .hbl filename. ${lng} macro is accepted in filename" ,;
+      "  -hbl[=<output>]    output .hbl filename. ${lng} macro is accepted in filename" ,;
       "  -lng=<languages>   list of languages to be replaced in ${lng} macros in .po" ,;
       "                     filenames and output .hbl filenames. Comma separared list:" ,;
       "                     -lng=en-EN,hu-HU,de" ,;