diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d565ec042034..6aeddd60733f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -3,6 +3,11 @@
 	* java/net/URLStreamHandler.java
 	(parseURL): Fixed file path canonicalisation.
 
+2004-11-18  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/net/URLStreamHandler.java
+	(parseURL): Fixed file path canonicalisation.
+
 2004-11-18  Michael Koch  <konqueror@gmx.de>
 
 	* java/net/URLClassLoader.java: Whitespace cleanup.
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 2e91eb64014d..fbe863f24c0e 100644
--- a/libjava/java/net/URLStreamHandler.java
+++ b/libjava/java/net/URLStreamHandler.java
@@ -214,23 +214,9 @@ public abstract class URLStreamHandler
 	  file = (file.substring(0, lastSlash)
 		  + '/' + spec.substring(start, end));
 
-	if (url.getProtocol().equals("file"))
-	  {
-	    // For "file" URLs constructed relative to a context, we
-	    // need to canonicalise the file path.
-	    try
-	      {
-		boolean endsWithSlash = file.charAt(file.length() - 1) == '/';
-		file = new File(file).getCanonicalPath();
-		file = file.replace(separator, '/');
-		if (endsWithSlash && file.charAt(file.length() - 1) != '/')
-		  file += '/';
-	      }
-	    catch (IOException e)
-	      {
-		// Do nothing.
-	      }
-	  }
+	// For URLs constructed relative to a context, we
+	// need to canonicalise the file path.
+	file = canonicalizeFilename(file);
 
 	ref = null;
       }