diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8b02ee833..3c131a3ddb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-30 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Continue if there were no input files specified. This
+      can be useful in some situations.
+    * Show warning about no input files only when -info option is used.
+    + Consider resource files as valid input files when showing
+      above warning.
+
 2011-03-30 14:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/gtwin/gtwin.c
     % Replaced kbd modifier readout with a more efficient
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 9aa471b20e..a3943da253 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2994,9 +2994,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    ENDIF
 
    /* Start doing the make process. */
-   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. ! hbmk[ _HBMK_lCreateImpLib ] .AND. ( Len( hbmk[ _HBMK_aPLUGINPars ] ) + Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0 .AND. ! hbmk[ _HBMK_lContainer ]
-      hbmk_OutErr( hbmk, I_( "Warning: No source files were specified." ) )
-      RETURN _ERRLEV_OK
+   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. ! hbmk[ _HBMK_lCreateImpLib ] .AND. ;
+      ( Len( hbmk[ _HBMK_aPLUGINPars ] ) + Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aRESSRC ] ) + Len( hbmk[ _HBMK_aRESCMP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0 .AND. ! hbmk[ _HBMK_lContainer ]
+      IF hbmk[ _HBMK_lInfo ]
+         hbmk_OutErr( hbmk, I_( "Warning: No source files were specified." ) )
+      ENDIF
    ENDIF
 
    /* Decide about output name */