diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0a11416648c..9f33b3ed7b0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-04  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/nio/channels/FileChannelImpl.java
+	(finalize): New method.
+
 2004-05-03  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* Makefile.am (WARNINGS): Replace -W with the more speaking -Wextra.
diff --git a/libjava/gnu/java/nio/channels/FileChannelImpl.java b/libjava/gnu/java/nio/channels/FileChannelImpl.java
index ea6ef0e43bf..f4686b26d4f 100644
--- a/libjava/gnu/java/nio/channels/FileChannelImpl.java
+++ b/libjava/gnu/java/nio/channels/FileChannelImpl.java
@@ -115,6 +115,11 @@ public final class FileChannelImpl extends FileChannel
     this.mode = mode;
   }
 
+  protected void finalize() throws Throwable
+  {
+    close();
+  }
+
   public static FileChannelImpl in;
   public static FileChannelImpl out;
   public static FileChannelImpl err;