diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
index 6b9ce40e9..826714751 100644
--- a/org.eclipse.jgit.pgm/jgit.sh
+++ b/org.eclipse.jgit.pgm/jgit.sh
@@ -61,14 +61,18 @@ this_script=`which "$0" 2>/dev/null`
 [ $? -gt 0 -a -f "$0" ] && this_script="$0"
 cp=$this_script
 
+platform="`uname`"
 if [ -n "$JGIT_CLASSPATH" ]
 then
-	cp="$cp:$JGIT_CLASSPATH"
+	cp_sep=:
+	# On Windows & MingW use ";" to separate classpath entries
+	[ "${platform#MINGW}" != "$platform" ] && cp_sep=";"
+	cp="$cp$cp_sep$JGIT_CLASSPATH"
 fi
 
 # Cleanup paths for Cygwin.
 #
-case "`uname`" in
+case "$platform" in
 CYGWIN*)
 	cp=`cygpath --windows --mixed --path "$cp"`
 	;;