diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f7f1a97937..7fe458d47e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,22 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-27 16:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbdefs.h
+    * include stdint.h in DJGPP >= 2.4
+
+  * harbour/source/common/hbprintf.c
+    ! fixed DJGPP <= 2.3 compilation
+
+  * harbour/source/common/hbstr.c
+    * force buffer ending in DJGPP <= 2.3 when vsprintf() is used
+
+  * harbour/source/rtl/hbproces.c
+    ! fixed typo in HB_SYMBOL_UNUSED() variable name
+
+  * harbour/config/dos/global.cf
+    ! fixed for GNU make ports which prefer COMSPEC before SHELL
+
 2009-01-27 15:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/common/hbprintf.c
     ! fixed two bugs in conversions
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index ac09289b02..af25d73c9b 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -93,8 +93,8 @@ MDP = mkdir -p
 RANLIB = ranlib
 
 dirbase::
-	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
-	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@sh -c "[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)"
+	@sh -c "[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)"
 
 clean::
 	-$(RD) $(ARCH_DIR) $(LIB_ARCH)
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 81bcddf42b..dbf860da59 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -69,6 +69,9 @@
     ( defined( __WATCOMC__ ) && __WATCOMC__ >= 1270 ) || \
     ( defined( __GNUC__ ) && \
       ( defined( _ISOC99_SOURCE ) || \
+        ( defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L ) || \
+        ( defined( __DJGPP__ ) && \
+          ( __DJGPP__ > 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ >= 4 ) ) ) || \
         defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) ) )
    #include <stdint.h>
    /* workaround for BCC 5.8 bug */
diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c
index f70ca6a39d..4596937bcf 100644
--- a/harbour/source/common/hbprintf.c
+++ b/harbour/source/common/hbprintf.c
@@ -139,7 +139,9 @@ HB_EXTERN_END
 #endif
 
 #if ( defined( __BORLANDC__ ) && __BORLANDC__ < 1410 ) || \
-    ( defined( __WATCOMC__ ) && __WATCOMC__ < 1270 )
+    ( defined( __WATCOMC__ ) && __WATCOMC__ < 1270 ) || \
+    ( defined( __DJGPP__ ) && \
+      ( __DJGPP__ < 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ <= 3 ) ) )
 #  define intmax_t      _x_longlong
 #  define uintmax_t     _x_ulonglong
 #endif
diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c
index d8571edf85..5dd7f9f653 100644
--- a/harbour/source/common/hbstr.c
+++ b/harbour/source/common/hbstr.c
@@ -1115,6 +1115,7 @@ ULONG hb_snprintf( char * buffer, ULONG nSize, const char * format, ... )
    /* Use vsprintf() for DJGPP <= 2.03.
       This is a temporary hack, should implement a C99 snprintf() ourselves. */
    result = vsprintf( buffer, format, arglist );
+   #define _HB_SNPRINTF_ADD_EOS
 #elif defined( _MSC_VER ) && _MSC_VER >= 1400
    result = _vsnprintf_s( buffer, nSize, _TRUNCATE, format, arglist );
 #elif ( defined( _MSC_VER ) || defined( __DMC__ ) ) && !defined( __XCC__ )
diff --git a/harbour/source/rtl/hbproces.c b/harbour/source/rtl/hbproces.c
index 30999b241f..2603f83ebd 100644
--- a/harbour/source/rtl/hbproces.c
+++ b/harbour/source/rtl/hbproces.c
@@ -569,7 +569,7 @@ HB_FHANDLE hb_fsProcessOpen( const char *pszFilename,
 {
    int TODO; /* TODO: for given platform */
 
-   HB_SYMBOL_UNUSED( pszFileName );
+   HB_SYMBOL_UNUSED( pszFilename );
    HB_SYMBOL_UNUSED( phStdin );
    HB_SYMBOL_UNUSED( phStdout );
    HB_SYMBOL_UNUSED( phStderr );