diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 60100862c1..5314f1a935 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-11 13:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/libpng/Makefile
+    ! Fixed to properly link with DJGPP.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed ${hb_cpu} macro for dos/os2 platforms.
+
+  * contrib/hbhpdf/Makefile
+  * utils/hbmk2/examples/contribf.hbc
+    + Enabled for DOS platform.
+
+  ; I could back port my app to DOS after these changes, with
+    only inet stuff not linked in.
+
 2009-06-11 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Further cleanups in pocc examples.
diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile
index 4d65f59982..398544c678 100644
--- a/harbour/contrib/hbhpdf/Makefile
+++ b/harbour/contrib/hbhpdf/Makefile
@@ -6,8 +6,6 @@ ROOT = ../../
 
 LIBNAME=hbhpdf
 
-ifneq ($(HB_ARCHITECTURE),dos)
-
 ifeq ($(HB_INC_LIBHARU),)
 ifeq ($(HB_XBUILD),)
 HB_INC_LIBHARU = /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
@@ -38,6 +36,3 @@ install::
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
-else
-include $(TOP)$(ROOT)config/none.cf
-endif
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index b2895bb5bd..a3530cf42f 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -5,6 +5,10 @@
 HB_BUILD_WARN = no
 HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
 
+ifeq ($(HB_COMPILER),djgpp)
+HB_USER_CFLAGS += -DPNG_NO_SNPRINTF
+endif
+
 ROOT = ../../
 
 LIBNAME=libpng
diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc
index ee0ef33404..f8f0b20c55 100644
--- a/harbour/utils/hbmk2/examples/contribf.hbc
+++ b/harbour/utils/hbmk2/examples/contribf.hbc
@@ -9,11 +9,11 @@
 libs=hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmzip hbnf hbvpdf hbziparc rddsql xhb
 
 # contribs portable, with external dependencies:
-libs=hbcurl hbfbird hbgd hbmsql hbmysql hbpgsql hbqt sddfb sddmy sddpg
+libs=hbcurl hbfbird hbgd hbhpdf hbmsql hbmysql hbpgsql hbqt sddfb sddmy sddpg
 
 # contribs with limited availability (some with external dependencies):
 {!pocc&!xcc&!dmc&!owatcom}libs=gtalleg
-{!dos}libs=hbapollo hbfimage hbhpdf hbssl hbtip rddads
+{!dos}libs=hbapollo hbfimage hbssl hbtip rddads
 {linux|win|os2}libs=hbtpathy
 {win}libs=gtwvg hbblat hbgfwin hbwin rddado
 {win&!dmc}libs=hbwhat
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 10e63a06cf..ba43e2829d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5989,7 +5989,8 @@ FUNCTION hbmk_COMP( hbmk )
 FUNCTION hbmk_CPU( hbmk )
 
    DO CASE
-   CASE hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|cygwin|owatcom|bcc|icc|xcc" .OR. ;
+   CASE hbmk[ _HBMK_cARCH ] $ "dos|os2" .OR. ;
+        hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|cygwin|owatcom|bcc|icc|xcc" .OR. ;
         hbmk[ _HBMK_cCOMP ] == "mingw" .OR. ;
         hbmk[ _HBMK_cCOMP ] == "msvc" .OR. ;
         hbmk[ _HBMK_cCOMP ] == "pocc"