diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
index 3a25f61..641f0a4 100644
--- a/src/main/java/org/umlgraph/doclet/Version.java
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -1,4 +1,4 @@
 /* Automatically generated file */
 package org.umlgraph.doclet;
-class Version { public static String VERSION = "R5_7_2-1-g9039a0";}
+class Version { public static String VERSION = "R5_7_2-3-gee82a7";}
 	
\ No newline at end of file
diff --git a/umlgraph b/umlgraph
index 2119ace..71794b0 100755
--- a/umlgraph
+++ b/umlgraph
@@ -8,6 +8,13 @@
 
 UMLGRAPH_HOME=lib
 
+# Obtain a classpath path separator that works for Unix and Cygwin
+if  expr "$JAVA_HOME" : '.*:' >/dev/null ; then
+  CPS=';'
+else
+  CPS=':'
+fi
+
 if [ x$2 = x ]
 then
 	echo usage: umlgraph base_file_name filetype [umlgraph arguments] 1>&2
@@ -18,7 +25,7 @@ else
 	BASE=$1
 	FILETYPE=$2
 	shift 2
-	java -classpath "$UMLGRAPH_HOME/UmlGraph.jar:$JAVA_HOME/lib/tools.jar" \
+	java -classpath "$UMLGRAPH_HOME/UmlGraph.jar${CPS}$JAVA_HOME/lib/tools.jar" \
 	org.umlgraph.doclet.UmlGraph -package $* -output - $BASE.java |
 	dot -T$FILETYPE -o$BASE.$FILETYPE
 fi