diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e721f3ec8d6..ee438add718 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-15  Mark Wielaard  <mark@klomp.org>
+
+	* java/net/URLClassLoader.java (JarURLLoader.JarURLLoader): Just use
+	space for parsing CLASS_PATH attribute.
+
 2005-02-15  Mark Wielaard  <mark@klomp.org>
 
 	* java/net/URLClassLoader.java (JarURLLoader.JarURLLoader): Don't look
diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java
index 268b0b45caf..0ee2e748a3d 100644
--- a/libjava/java/net/URLClassLoader.java
+++ b/libjava/java/net/URLClassLoader.java
@@ -341,11 +341,7 @@ public class URLClassLoader extends SecureClassLoader
 	    {
 	      this.classPath = new Vector();
 	      
-	      StringTokenizer st
-		= new StringTokenizer 
-		(classPathString,
-		 System.getProperty ("path.separator", ":"));
-	      
+	      StringTokenizer st = new StringTokenizer(classPathString, " ");
 	      while (st.hasMoreElements ()) 
 		{  
 		  String e = st.nextToken ();