diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 171d5798a0..5f88900ee0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,24 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-16 21:52 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbcurl/hbcurl.hbp
+  * contrib/hbssl/hbssl.hbp
+    + added experimental support to install 3rd party .dll
+      dependencies for these libs into the Harbour bin dir.
+      Enabled with new build option, not yet documented,
+      see it in the patch.
+
+  * src/rtl/cdpdet.prg
+    + request linkage of all codepages. I chose this to ensure
+      the detection code can use all CPs automatically and it
+      won't be unusable if users forget to request CPs
+      themselves. This has an overhead if someone uses CP
+      autodetection, but it makes it foolproof.
+
+  * utils/hbmk2/hbmk2.prg
+    * minor formatting
+
 2012-06-16 18:02 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.hbp
   * utils/hbmk2/Makefile
@@ -47,6 +65,7 @@
       Make and prevents autodetection.
       TODO: Recheck if it now works without embedded headers. [DONE]
       TODO: Obsolete HB_INSTALL_PREFIX also in hbmk2 mode.
+            [CAN'T. It's used in contrib/make.hb to support cross builds.]
 
 2012-06-16 12:42 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/include/hbexprb.c
diff --git a/harbour/contrib/hbcurl/hbcurl.hbp b/harbour/contrib/hbcurl/hbcurl.hbp
index ba1d0ad9f5..3f9be00ee1 100644
--- a/harbour/contrib/hbcurl/hbcurl.hbp
+++ b/harbour/contrib/hbcurl/hbcurl.hbp
@@ -6,7 +6,11 @@ hbcurl.hbm
 
 -depimplibs=curl:../libcurl.dll
 -depimplibs=curl:../bin/libcurl.dll
+-depfinish=curl
 
 -iflag={bcc}-a
 
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_CURL}/../libcurl.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_CURL}/../bin/libcurl.dll
+
 hbcurls.hbp
diff --git a/harbour/contrib/hbssl/hbssl.hbp b/harbour/contrib/hbssl/hbssl.hbp
index ac4b3e9738..7da4048e77 100644
--- a/harbour/contrib/hbssl/hbssl.hbp
+++ b/harbour/contrib/hbssl/hbssl.hbp
@@ -9,11 +9,19 @@
 -depimplibs=openssl:../dll/ssleay32.dll
 -depimplibs=openssl:../libeay32.dll
 -depimplibs=openssl:../ssleay32.dll
+-depfinish=openssl
 
 hbssl.hbm
 
 {allwin&HBMK_HAS_OPENSSL}-cflag=-I${HB_WITH_OPENSSL}/../inc32
 
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../out32dll/libeay32.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../out32dll/ssleay32.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../dll/libeay32.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../dll/ssleay32.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../libeay32.dll
+{hbdyn&win&HB_INSTALL_3RDDYN='yes'}-instfile=${HBMK_DIR_OPENSSL}/../ssleay32.dll
+
 -iflag={bcc}-a
 
 hbssls.hbp
diff --git a/harbour/src/rtl/cdpdet.prg b/harbour/src/rtl/cdpdet.prg
index 618a022b47..cf5abfb06d 100644
--- a/harbour/src/rtl/cdpdet.prg
+++ b/harbour/src/rtl/cdpdet.prg
@@ -50,6 +50,8 @@
  *
  */
 
+#include "hbextcdp.ch"
+
 FUNCTION hb_cdpTerm()
    LOCAL cCP
    LOCAL cLang
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d8881c2adf..f71ba64e42 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12192,9 +12192,9 @@ STATIC FUNCTION hbmk_CoreHeaderFiles()
 /* Implement hbshell (formerly known as hbrun) */
 
 #if defined( __PLATFORM__DOS )
-#  define _EXT_FILE_ "hb_ext.ini"
+   #define _EXT_FILE_ "hb_ext.ini"
 #else
-#  define _EXT_FILE_ "hb_extension"
+   #define _EXT_FILE_ "hb_extension"
 #endif
 #define _EXT_ENV_  "HB_EXTENSION"
 
@@ -12951,9 +12951,9 @@ STATIC PROCEDURE __hbshell_Exec( cCommand )
 #define _HISTORY_DISABLE_LINE "no"
 
 #if defined( __PLATFORM__DOS )
-#  define _FNAME_HISTORY_ "hbhist.ini"
+   #define _FNAME_HISTORY_ "hbhist.ini"
 #else
-#  define _FNAME_HISTORY_ ".hb_history"
+   #define _FNAME_HISTORY_ ".hb_history"
 #endif
 
 EXIT PROCEDURE __hbshell_exit()