diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index da005155395b..0d9267e4af36 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-07  David Daney  <ddaney@avtrex.com>
+
+	* mauve-libgcj: Disable javax.rmi.* and
+	java.io.InputStreamReader.getEncoding.
+
 2005-11-04  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/14358, libgcj/24552:
diff --git a/libjava/mauve-libgcj b/libjava/mauve-libgcj
index ff3b1f5a867c..76c18f2d92be 100644
--- a/libjava/mauve-libgcj
+++ b/libjava/mauve-libgcj
@@ -22,3 +22,5 @@ JDBC2.0
 # Tests for not yet implemented classes and/or methods.
 !java.awt.event.MouseEvent.modifiersEx
 !org.omg.
+!javax.rmi
+!java.io.InputStreamReader.getEncoding