diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 291f2546aba2..4a88ac607bcf 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-02  Anthony Green  <green@redhat.com>
+
+	PR libgcj/20727
+	* java/nio/DirectByteBufferImpl.java: Fix buffer ownership bug.
+
 2005-04-02  Mark Wielaard  <mark@klomp.org>
 
 	* javax/naming/directory/BasicAttributes.java (equals): Compare to any
diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java
index 83279382a22f..a0599c722a9a 100644
--- a/libjava/java/nio/DirectByteBufferImpl.java
+++ b/libjava/java/nio/DirectByteBufferImpl.java
@@ -117,7 +117,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer
   DirectByteBufferImpl(RawData address, int capacity)
   {
     super(capacity, capacity, 0, -1);
-    this.owner = this;
+    this.owner = null;
     this.address = address;
   }