diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 84a61c2dca9..69e846ffc2e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* resolve.cc (_Jv_PrepareClass): Fix typos in vtable layout.
+
 2001-10-02  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am (core_java_source_files): add InheritableThreadLocal
diff --git a/libjava/resolve.cc b/libjava/resolve.cc
index e44ba6d339a..df48c269c67 100644
--- a/libjava/resolve.cc
+++ b/libjava/resolve.cc
@@ -732,9 +732,9 @@ _Jv_PrepareClass(jclass klass)
 	    throw_internal_error ("vtable problem...");
 
 	  if (clz->interpreted_methods[i] == 0)
-	    vtable->set_method(i, (void*)&_Jv_abstractMethodError);
+	    vtable->set_method(index, (void*)&_Jv_abstractMethodError);
 	  else
-	    vtable->set_method(i, this_meth->ncode);
+	    vtable->set_method(index, this_meth->ncode);
 	}
     }