diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ad6c1fba4ef3d74a872d4371b0f083246e784273..6dc622b423456d5f537dbc0a49c0ae6f81d33f0f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-15  Gary Benson  <gbenson@redhat.com>
+
+	* java/nio/MappedByteBuffer.java: Removed.
+	* sources.am, Makefile.in: Rebuilt.
+
 2007-01-15  Gary Benson  <gbenson@redhat.com>
 
 	* java/net/URLClassLoader.java: Removed.
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e03542934f2b194384197990d353d6a2936f11ff..78013d50100260f8bf867ac6e6914748edd8a1ea 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4441,7 +4441,7 @@ classpath/java/nio/InvalidMarkException.java \
 classpath/java/nio/LongBuffer.java \
 classpath/java/nio/LongBufferImpl.java \
 classpath/java/nio/LongViewBufferImpl.java \
-java/nio/MappedByteBuffer.java \
+classpath/java/nio/MappedByteBuffer.java \
 java/nio/MappedByteBufferImpl.java \
 classpath/java/nio/ReadOnlyBufferException.java \
 classpath/java/nio/ShortBuffer.java \
diff --git a/libjava/classpath/lib/java/nio/MappedByteBuffer.class b/libjava/classpath/lib/java/nio/MappedByteBuffer.class
index ff12d90a2b947fbb92780591243ee81ab99ebca6..05f6493a0cdf6bde5f7ec4a386a8fdf41e28b5e3 100644
Binary files a/libjava/classpath/lib/java/nio/MappedByteBuffer.class and b/libjava/classpath/lib/java/nio/MappedByteBuffer.class differ
diff --git a/libjava/java/nio/MappedByteBuffer.java b/libjava/java/nio/MappedByteBuffer.java
deleted file mode 100644
index 9b6df1715727fd96b797b7e6d71935c99cf2852b..0000000000000000000000000000000000000000
--- a/libjava/java/nio/MappedByteBuffer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* MappedByteBuffer.java -- 
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package java.nio;
-
-/**
- * @author Michael Koch (konqueror@gmx.de)
- * @since 1.4
- */
-public abstract class MappedByteBuffer extends ByteBuffer
-{
-  MappedByteBuffer (int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-  }
-  
-  void forceImpl()
-  {
-  }
-
-  public final MappedByteBuffer force ()
-  {
-    forceImpl();
-    return this;
-  }
-    
-  boolean isLoadedImpl()
-  {
-    load();
-    return true;
-  }
-
-  public final boolean isLoaded ()
-  {
-    return isLoadedImpl();
-  }
-    
-  void loadImpl()
-  {
-  }
-
-  public final MappedByteBuffer load ()
-  {
-    loadImpl();
-    return this;
-  }
-
-  void unmapImpl ()
-  {
-    forceImpl();
-  }
-
-  public void finalize () { unmapImpl(); }
-}
diff --git a/libjava/sources.am b/libjava/sources.am
index 418bd8d7c52a2b35a695c3520be53c47371ca3c0..e1fcbf315d9aa0fc10bbe07f6fde3463c6502e7d 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -4893,7 +4893,7 @@ classpath/java/nio/InvalidMarkException.java \
 classpath/java/nio/LongBuffer.java \
 classpath/java/nio/LongBufferImpl.java \
 classpath/java/nio/LongViewBufferImpl.java \
-java/nio/MappedByteBuffer.java \
+classpath/java/nio/MappedByteBuffer.java \
 java/nio/MappedByteBufferImpl.java \
 classpath/java/nio/ReadOnlyBufferException.java \
 classpath/java/nio/ShortBuffer.java \