diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d271c56a32..d26f6f179e 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-03-18 13:09 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * include/hbapi.h
+    ! Added HB_EXPORT declaration for hb_vmSetLinkedMain().
+
+  * utils/hbmk2/hbmk2.prg
+    ! Regression regarding -ldflag: option handling.
+
 2009-03-18 12:16 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/tests/speedtst.prg
     ! fixed typo.
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index 8c2c519ea8..283c44eb4a 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -1016,6 +1016,8 @@ extern void     hb_i18n_release( void * cargo );
 extern void *   hb_i18n_alloc( void * cargo );
 #endif /* _HB_API_INTERNAL_ || _HB_I18N_INTERNAL_ */
 
+extern HB_EXPORT void         hb_vmSetLinkedMain( const char * szMain );
+
 /* misc */
 extern HB_EXPORT char *       hb_verPlatform( void );        /* retrieves a newly allocated buffer containing platform version */
 extern HB_EXPORT char *       hb_verCompiler( void );        /* retrieves a newly allocated buffer containing compiler version */
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 6f43da2078..60facd76ae 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -848,15 +848,6 @@ FUNCTION Main( ... )
             AAdd( s_aLIBPATH, PathSepToTarget( cParam ) )
          ENDIF
 
-      CASE Left( cParam, 2 ) == "-l" .AND. ;
-           Len( cParam ) > 2 .AND. ;
-           !( Left( cParam, 3 ) == "-l-" )
-
-         cParam := ArchCompFilter( SubStr( cParam, 3 ) )
-         IF ! Empty( cParam )
-            AAdd( s_aLIBUSER, PathSepToTarget( cParam ) )
-         ENDIF
-
       CASE Left( cParamL, Len( "-prgflag:" ) ) == "-prgflag:"
 
          cParam := ArchCompFilter( SubStr( cParam, Len( "-prgflag:" ) + 1 ) )
@@ -883,6 +874,15 @@ FUNCTION Main( ... )
             AAdd( s_aOPTL   , PathSepToTarget( cParam, 2 ) )
          ENDIF
 
+      CASE Left( cParam, 2 ) == "-l" .AND. ;
+           Len( cParam ) > 2 .AND. ;
+           !( Left( cParam, 3 ) == "-l-" )
+
+         cParam := ArchCompFilter( SubStr( cParam, 3 ) )
+         IF ! Empty( cParam )
+            AAdd( s_aLIBUSER, PathSepToTarget( cParam ) )
+         ENDIF
+
       CASE Left( cParam, 1 ) $ cOptPrefix
 
          DO CASE