diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ace91c806e0..62dda821749 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-20  Tom Tromey  <tromey@cygnus.com>
 
+	* java/io/File.java (getParentFile): New method, from Classpath
+	via Oskar Liljeblad.
+
 	* java/util/Vector.java (remove(Object)): Implemented.
 
 2000-07-19  Jeff Sturm  <jeff.sturm@appnet.com>
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index c8aaddfac2a..b9ff9ff23f2 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -119,6 +119,12 @@ public class File implements Serializable
     return path.substring(0, last);
   }
 
+  public File getParentFile ()
+  {
+    String parent = getParent ();
+    return (parent == null ? null : new File (parent));
+  }
+
   public String getPath ()
   {
     return path;