diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cdb04d0535c..a2187f11c68 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-05  Tom Tromey  <tromey@redhat.com>
+
+	* javax/naming/CompoundName.java (endsWith): Look at correct
+	element of source name.
+
 2004-05-05  Mark Wielaard  <mark@klomp.org>
 
 	Reported by f.haeglsperger@gmx.de [classpath patch #2485]
diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java
index 87d26feb43b..4908d1bed6d 100644
--- a/libjava/javax/naming/CompoundName.java
+++ b/libjava/javax/naming/CompoundName.java
@@ -264,7 +264,7 @@ public class CompoundName implements Name, Cloneable, Serializable
     int delta = elts.size () - cn.elts.size ();
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	String f = canonicalize ((String) elts.get (i));
+	String f = canonicalize ((String) elts.get (delta + i));
 	if (! f.equals (canonicalize ((String) cn.elts.get (i))))
 	  return false;
       }