diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 40b9998232e..b36548a7553 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-14  Robin Green  <greenrd@greenrd.org>
+
+	* java/io/File.java (toURI): Generate a URI which we understand.
+
 2005-01-13  Graydon Hoare  <graydon@redhat.com>
 
 	* include/jni.h (_Jv_JNIEnv::bottom_locals): New field.
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 187558dacb4..2bbf47f9261 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -1,5 +1,5 @@
 /* File.java -- Class representing a file on disk
-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -936,7 +936,7 @@ public class File implements Serializable, Comparable
         
     try
       {
-	return new URI("file", "", abspath.replace(separatorChar, '/'));
+	return new URI("file", abspath.replace(separatorChar, '/'), null);
       }
     catch (URISyntaxException use)
       {