diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d9c0ca2129..ec1e9f5a2e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,13 +8,21 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-04 22:57 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/common.mak
+  * harbour/make_gcc.mak
+    ! Fixed compilation under DJGPP
+
+  * contrib/mtpl_gcc.mak
+    ! Fixed compilation under GNU make
+
 2008-02-04 15:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/os2/global.cf
     * added workaround for non working 'if' function in OS2 GNU make port
 
 2008-02-04 16:40 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/source/vm/fm.c
-    ! fixed hex dump of fm.log. The previous "hex" dump contained 
+    ! fixed hex dump of fm.log. The previous "hex" dump contained
       characters: ( ) . , + - / *
 
 2008-02-04 09:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -100,7 +108,7 @@
    + contrib/examples/dbfdbt/dbfdbt1.c
    + contrib/examples/dbfdbt/Makefile
    - source/rdd/dbfdbt
-     * Moved no longer used (superceded) core RDD code to 
+     * Moved no longer used (superceded) core RDD code to
        /contrib/examples/
 
 2008-02-02 02:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
@@ -133,7 +141,7 @@
 2008-02-01 02:35 UTC+0100 Ryszard Glab <harbour//rglab.pl>
    * config/lib.cf
       * added vpath to search target libraries in lib/<arch>/<compiler>
-      
+
    * config/darwin/global.cf
    * config/hpux/global.cf
    * config/dos/global.cf
@@ -199,7 +207,7 @@
       * fixed to link contrib libraries (all contrib libraries are
         placed in lib/<arch>/<compiler> directory)
         NOTE:
-        OS/2 users: the names of libraries have 'hbgf' prefix 
+        OS/2 users: the names of libraries have 'hbgf' prefix
 
 2008-01-31 18:41 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
    + contrib/mtpl_gcc.mak
diff --git a/harbour/common.mak b/harbour/common.mak
index df5ca43598..894c5ba614 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -181,6 +181,7 @@ $(USRRDD_DIR);\
 $(GTCGI_DIR);\
 $(GTSTD_DIR);\
 $(GTPCA_DIR);\
+$(GTDOS_DIR);\
 $(GTWIN_DIR);\
 $(GTWVT_DIR);\
 $(GTGUI_DIR);\
diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak
index bd8d2ce48f..2481320dda 100644
--- a/harbour/contrib/mtpl_gcc.mak
+++ b/harbour/contrib/mtpl_gcc.mak
@@ -128,15 +128,15 @@ LDFLAGS        := $(LDFLAGS)
 
 #**********************************************************
 # General *.c --> *.obj COMPILE rule for STATIC Libraries
-$(OBJ_DIR)/%$(OBJEXT) : %.c
+$(OBJ_DIR)%$(OBJEXT) : %.c
 	$(CC) $(CLIBFLAGS) -o$@ $<
 #**********************************************************
 # General *.cpp --> *.obj COMPILE rule for STATIC Libraries
-$(OBJ_DIR)/%$(OBJEXT) : %.cpp
+$(OBJ_DIR)%$(OBJEXT) : %.cpp
 	$(CXX) $(CLIBFLAGS) -o$@ $<
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
-$(OBJ_DIR)/%$(OBJEXT) : %.prg
+$(OBJ_DIR)%$(OBJEXT) : %.prg
 	$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)/ $<
 	$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)/$(<F:.prg=.c)
 #**********************************************************
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index 81aa1fa3a1..42ea2fe0ad 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -359,6 +359,9 @@ $(GTSTD_LIB)    : $(GTSTD_LIB_OBJS)
 $(GTPCA_LIB)    : $(GTPCA_LIB_OBJS)
 	$(MKLIB) $(ARFLAGS) $@ $^
 #**********************************************************
+$(GTDOS_LIB)    : $(GTDOS_LIB_OBJS)
+	$(MKLIB) $(ARFLAGS) $@ $^
+#**********************************************************
 $(GTWIN_LIB)    : $(GTWIN_LIB_OBJS)
 	$(MKLIB) $(ARFLAGS) $@ $^
 #**********************************************************