diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b6f6e3a694d4..4c967594797a 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Bryce McKinlay  <mckinlay@redhat.com>
+
+	PR java/20697
+	* parse.y (find_most_specific_methods_list): Remove special case for
+	inner classes.
+
 2005-06-15  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/21906:
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 11087192bec5..0c35911ed455 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -11416,13 +11416,9 @@ find_most_specific_methods_list (tree list)
 	  if (argument_types_convertible (method_v, current_v))
 	    {
 	      if (valid_method_invocation_conversion_p
-		  (DECL_CONTEXT (method_v), DECL_CONTEXT (current_v))
-		  || (INNER_CLASS_TYPE_P (DECL_CONTEXT (current_v))
-		      && enclosing_context_p (DECL_CONTEXT (method_v),
-					      DECL_CONTEXT (current_v))))
+		  (DECL_CONTEXT (method_v), DECL_CONTEXT (current_v)))
 		{
-		  int v = (DECL_SPECIFIC_COUNT (current_v) +=
-		    (INNER_CLASS_TYPE_P (DECL_CONTEXT (current_v)) ? 2 : 1));
+		  int v = (DECL_SPECIFIC_COUNT (current_v) += 1);
 		  max = (v > max ? v : max);
 		}
 	    }
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c8532c7badb1..c81a79b0e894 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-23  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* testsuite/libjava.compile/PR20697.java: New test-case.
+
 2005-06-22  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Makefile.am (SUBDIRS): Use append for conditional.
diff --git a/libjava/testsuite/libjava.compile/PR20697.java b/libjava/testsuite/libjava.compile/PR20697.java
new file mode 100644
index 000000000000..56efb1d36b79
--- /dev/null
+++ b/libjava/testsuite/libjava.compile/PR20697.java
@@ -0,0 +1,29 @@
+public class PR20697
+{
+    public interface I
+    {
+        public void m();
+    }
+
+    public static class A2 implements I
+    {
+        public void m()
+        {
+            return;
+        }
+    }
+    
+}
+
+class Test extends PR20697.A2
+{
+    public void m()
+    {
+        return;
+    }
+
+    public void n()
+    {
+        m();
+    }
+}