diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ef99c3155c..1acae14bc1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-05 14:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    ! Don't pickup dependencies with long-filename on MS-DOS hosts.
+      Please test.
+
+  * contrib/hbplist
+    ! Added missing dependency comment.
+
+  * contrib/rddads/rddads.h
+    ! Fixed mingw warnings after recent change. Now _declspec
+      is only defined for mingw, if it isn't already. Pls review me.
+
+  * utils/hbmk2/hbmk2.prg
+    * Formatting.
+
 2010-11-05 14:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_hbmk2_plugin.hbs
     + Added support for converting multiple input .qth files to
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index 189601f8b3..01560093ff 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -20,7 +20,7 @@ hbfoxpro/hbfoxpro.hbp
 hbfship/hbfship.hbp
 hbgd/hbgd.hbp
 hbgt/hbgt.hbp
-hbhpdf/hbhpdf.hbp
+hbhpdf/hbhpdf.hbp                # uses: libhpdf (external)
 hbide/hbide.hbp
 hbmemio/hbmemio.hbp
 hbmisc/hbmisc.hbp
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index a06c0d1871..eabf22583f 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -496,6 +496,12 @@ STATIC FUNCTION call_hbmk2_hbinfo( cProjectPath, hProject )
       FOR EACH tmp IN hb_ATokens( hbmk2_hbinfo_getitem( cStdOut, "hbctree", .T. ), Chr( 10 ) )
          IF ! Empty( tmp )
             hb_FNameSplit( LTrim( tmp ), @cDir, @cName )
+            #ifdef __PLATFORM__DOS
+                /* Ignore long filenames on MS-DOS hosts */
+                IF Len( cName ) > 8
+                   LOOP
+                ENDIF
+            #endif
             AAdd( hProject[ "aDept" ], { "nDepth" => Len( tmp ) - Len( LTrim( tmp ) ),;
                                          "cFileName_HBP" => StrTran( PathNormalize( PathMakeAbsolute( FNameExtSet( PathSepToSelf( LTrim( tmp ) ), ".hbp" ), s_cRebase ) ), "\", "/" ) } )
          ENDIF
diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h
index 5d95122e39..17e1b69bd8 100644
--- a/harbour/contrib/rddads/rddads.h
+++ b/harbour/contrib/rddads/rddads.h
@@ -65,7 +65,7 @@
 #if !defined( x64 ) && defined( HB_ARCH_64BIT )
    #define x64
 #endif
-#if defined( __WATCOMC__ ) || defined( __LCC__ ) || defined( __MINGW32__ )
+#if defined( __WATCOMC__ ) || defined( __LCC__ ) || ( defined( __MINGW32__ ) && ! defined( _declspec ) )
    #define _declspec( dllexport ) __declspec( dllexport )
 #endif
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b4b7ce4707..ce432d4822 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -8862,7 +8862,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
             AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSERSYS ], MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) )
          NEXT
 
-      CASE Lower( Left( cLine, Len( "hbcs="        ) ) ) == "hbcs="          ; cLine := SubStr( cLine, Len( "hbcs="         ) + 1 )
+      CASE Lower( Left( cLine, Len( "hbcs="         ) ) ) == "hbcs="         ; cLine := SubStr( cLine, Len( "hbcs="         ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             IF nNestingLevel < _HBMK_NEST_MAX