diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 68c15d2b0c..c0e714c95b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-21 21:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! -hbimplib extended for msvc to first look for any existing
+      .lib file with the same name as the .dll.
+
+  * contrib/sddfb/sddfb.hbi
+  * contrib/hbfbird/hbfbird.hbi
+    * Changed to use existing .lib for msvc compilers.
+
 2010-05-21 17:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/compiler/genhrb.c
     ! Fixed very old copy paste error in .hrb generation feedback
diff --git a/harbour/contrib/hbfbird/hbfbird.hbi b/harbour/contrib/hbfbird/hbfbird.hbi
index d9bd1c84a1..a7af6a1242 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbi
+++ b/harbour/contrib/hbfbird/hbfbird.hbi
@@ -6,5 +6,5 @@
 
 -ofbclient
 
-{!allgcc}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
-{allgcc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
+{!(allgcc|allmsvc)}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
+{allgcc|allmsvc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
diff --git a/harbour/contrib/sddfb/sddfb.hbi b/harbour/contrib/sddfb/sddfb.hbi
index d9bd1c84a1..a7af6a1242 100644
--- a/harbour/contrib/sddfb/sddfb.hbi
+++ b/harbour/contrib/sddfb/sddfb.hbi
@@ -6,5 +6,5 @@
 
 -ofbclient
 
-{!allgcc}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
-{allgcc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
+{!(allgcc|allmsvc)}${HB_WITH_FIREBIRD}/../bin/fbclient.dll
+{allgcc|allmsvc}${HB_WITH_FIREBIRD}/../lib/fbclient_ms.lib
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 363491829d..c4bf8fa834 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7996,6 +7996,16 @@ STATIC FUNCTION win_implib_command_msvc( hbmk, cCommand, nCmd_Esc, cSourceDLL, c
 
    LOCAL cCommandDump
 
+   /* Try to find COFF .lib with the same name */
+   IF hb_FileExists( tmp := FN_ExtSet( cSourceDLL, ".lib" ) )
+      IF IsCOFFLib( tmp )
+         IF ! hbmk[ _HBMK_lQuiet ]
+            hbmk_OutStd( hbmk, I_( "Found COFF .lib with the same name, falling back to using it instead of the .dll." ) )
+         ENDIF
+         RETURN hb_FCopy( tmp, cTargetLib ) != F_ERROR
+      ENDIF
+   ENDIF
+
    cCommandDump := "dumpbin.exe -exports {ID}"
    cCommandDump := StrTran( cCommandDump, "{ID}", FN_Escape( cSourceDLL, nCmd_Esc ) )