diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 44901ecbb2..e5a26ffc60 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-08 00:31 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * bin/commit.hb
+    * made git detection generic
+    ! fixed calling shell on OS/2
+
+  * config/global.mk
+    * minor sync with other parts of Harbour
+
+  * contrib/hbblink/blinker.prg
+    ! fixed SWPRUNCMD() on OS/2
+
+  * contrib/hbxpp/runshell.prg
+    ! fixed for RUNSHELL() on non-*nix platforms
+
 2012-10-07 23:38 UTC+0200 Viktor Szakats (vszakats syenar.net)
   * doc/Makefile
   - doc/howtosvn.txt
diff --git a/harbour/bin/commit.hb b/harbour/bin/commit.hb
index a88ee2d398..61f9dddc61 100644
--- a/harbour/bin/commit.hb
+++ b/harbour/bin/commit.hb
@@ -94,7 +94,8 @@ STATIC FUNCTION VCSDetect()
 
    DO CASE
    CASE hb_DirExists( ".svn" ) ; RETURN "svn"
-   CASE hb_DirExists( ".." + hb_ps() +  ".git" ) ; RETURN "git"
+   CASE hb_DirExists( ".git" ) ; RETURN "git"
+   CASE hb_DirExists( ".." + hb_ps() + ".git" ) ; RETURN "git"
    ENDCASE
 
    RETURN ""
@@ -181,7 +182,7 @@ STATIC FUNCTION Shell()
    #endif
 
    IF ! Empty( cShell )
-      #if defined( __PLATFORM__WINDOWS ) .OR. defined( __PLATFORM__DOS )
+      #if ! defined( __PLATFORM__UNIX )
          cShell := cShell + " /c"
       #endif
    ENDIF
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index b515ad635c..305f6a461b 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -326,7 +326,7 @@ endif
 CMDPREF :=
 ifneq ($(HB_SHELL),sh)
    ifneq ($(COMSPEC),)
-      CMDPREF := $(COMSPEC) /C
+      CMDPREF := $(COMSPEC) /c
    endif
 endif
 
diff --git a/harbour/contrib/hbblink/blinker.prg b/harbour/contrib/hbblink/blinker.prg
index d3a7df710b..e782eb5536 100644
--- a/harbour/contrib/hbblink/blinker.prg
+++ b/harbour/contrib/hbblink/blinker.prg
@@ -323,10 +323,10 @@ FUNCTION SWPRUNCMD( cCommand, nMem, cRunPath, cTempPath )
    #endif
 
    IF ! Empty( cShell )
-      #if defined( __PLATFORM__WINDOWS ) .OR. defined( __PLATFORM__DOS )
-         cCommand := cShell + " /c " + cCommand
-      #else
+      #if defined( __PLATFORM__UNIX )
          cCommand := cShell + " " + cCommand
+      #else
+         cCommand := cShell + " /c " + cCommand
       #endif
    ENDIF
 
diff --git a/harbour/contrib/hbxpp/runshell.prg b/harbour/contrib/hbxpp/runshell.prg
index 731835b8cf..d49d385a1a 100644
--- a/harbour/contrib/hbxpp/runshell.prg
+++ b/harbour/contrib/hbxpp/runshell.prg
@@ -81,7 +81,11 @@ FUNCTION RunShell( cCommand, cProgram, lAsync, lBackground )
    ENDIF
 
    IF HB_ISSTRING( cCommand )
-      cProgram += " " + cCommand
+      #if defined( __PLATFORM__UNIX )
+         cProgram += " " + cCommand
+      #else
+         cProgram += " /c " + cCommand
+      #endif
    ENDIF
 
    RETURN hb_processRun( LTrim( cProgram ), NIL, NIL, NIL, lAsync )