diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3e2c5f2613a3..56e3b463693b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-06  Tom Tromey  <tromey@redhat.com>
+
+	* javax/naming/directory/BasicAttributes.java (attributes): Now
+	package-private.
+	* javax/imageio/spi/ServiceRegistry.java (categories): Now
+	package-private.
+
 2004-11-06  Tom Tromey  <tromey@redhat.com>
 
 	* java/net/URLClassLoader.java (URLClassLoader): Now
diff --git a/libjava/javax/imageio/spi/ServiceRegistry.java b/libjava/javax/imageio/spi/ServiceRegistry.java
index 566d50f732e6..3d7134ed53fb 100644
--- a/libjava/javax/imageio/spi/ServiceRegistry.java
+++ b/libjava/javax/imageio/spi/ServiceRegistry.java
@@ -62,6 +62,7 @@ import java.util.Set;
  */
 public class ServiceRegistry
 {
+  // Package-private to avoid a trampoline.
   /**
    * The service categories of this registry.
    *
@@ -73,7 +74,7 @@ public class ServiceRegistry
    *
    * @see #providers
    */
-  private final Class[] categories;
+  final Class[] categories;
 
 
   /**
diff --git a/libjava/javax/naming/directory/BasicAttributes.java b/libjava/javax/naming/directory/BasicAttributes.java
index eec1c88bbe71..9a9a80019a45 100644
--- a/libjava/javax/naming/directory/BasicAttributes.java
+++ b/libjava/javax/naming/directory/BasicAttributes.java
@@ -185,7 +185,8 @@ public class BasicAttributes implements Attributes
 
   // This is set by the serialization spec.
   private boolean ignoreCase;
-  private transient Vector attributes;
+  // Package-private to avoid a trampoline.
+  transient Vector attributes;
 
   // Used when enumerating.
   private class BasicAttributesEnumeration implements NamingEnumeration