diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index afadd005f9f4..7d37bc429286 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-05  Tom Tromey  <tromey@redhat.com>
+
+	* jni.cc (_Jv_LookupJNIMethod): Throw UnsatisfiedLinkError, not
+	AbstractMethodError.
+
 2002-03-03  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* Makefile.am: Use -bootclasspath, not -CLASSPATH.
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 04622f0b6719..1abd2d2497ac 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -26,7 +26,7 @@ details.  */
 #include <java/lang/Throwable.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/StringIndexOutOfBoundsException.h>
-#include <java/lang/AbstractMethodError.h>
+#include <java/lang/UnsatisfiedLinkError.h>
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoSuchFieldError.h>
 #include <java/lang/NoSuchMethodError.h>
@@ -2014,7 +2014,7 @@ _Jv_LookupJNIMethod (jclass klass, _Jv_Utf8Const *name,
       if (function == NULL)
 	{
 	  jstring str = JvNewStringUTF (name->data);
-	  throw new java::lang::AbstractMethodError (str);
+	  throw new java::lang::UnsatisfiedLinkError (str);
 	}
     }