diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 75c1c25b7ac..4aac14f38ab 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2007-02-15  Gary Benson  <gbenson@redhat.com>
+
+	* javax/management/ObjectName.java:
+	(getKeyPropertyList()): Remove cast and call
+	to UnmodifiableMap.
+
 2007-02-14  Gary Benson  <gbenson@redhat.com>
 
 	* javax/management/ObjectName.java
diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java
index 0b18c012516..757b80fb266 100644
--- a/libjava/classpath/javax/management/ObjectName.java
+++ b/libjava/classpath/javax/management/ObjectName.java
@@ -565,16 +565,15 @@ public class ObjectName
   /**
    * Returns the properties in a {@link java.util.Hashtable}.  The table
    * contains each of the properties as keys mapped to their value.  The
-   * returned table may be unmodifiable.  If the case that the table is
-   * modifiable, changes made to it will not be reflected in the object
-   * name.
+   * returned table is not unmodifiable, but changes made to it will not
+   * be reflected in the object name.
    *
    * @return a {@link java.util.Hashtable}, containing each of the object
    *         name's properties.
    */
   public Hashtable getKeyPropertyList()
   {
-    return (Hashtable) Collections.unmodifiableMap(new Hashtable(properties));
+    return new Hashtable(properties);
   }
 
   /**
diff --git a/libjava/classpath/lib/javax/management/ObjectName.class b/libjava/classpath/lib/javax/management/ObjectName.class
index 9895cbf5695..720f6689d43 100644
Binary files a/libjava/classpath/lib/javax/management/ObjectName.class and b/libjava/classpath/lib/javax/management/ObjectName.class differ