diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5b1c89ee91c0..51e82229b00c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-10  Mark Wielaard  <mark@klomp.org>
+
+	* jni.cc (_Jv_JNI_GetAnyMethodID): Add name and signature to
+	NoSuchMethodError.
+
 2004-06-11  Jerry Quinn  <jlquinn@optonline.net>
 
 	* java/util/GregorianCalendar.java (computeTime):  Skip buggy formulae
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 680e0c758df5..9d0239b230bc 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -1,6 +1,7 @@
 // jni.cc - JNI implementation, including the jump table.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation
 
    This file is part of libgcj.
 
@@ -27,6 +28,7 @@ details.  */
 #include <java/lang/Throwable.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/StringIndexOutOfBoundsException.h>
+#include <java/lang/StringBuffer.h>
 #include <java/lang/UnsatisfiedLinkError.h>
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoSuchFieldError.h>
@@ -705,7 +707,10 @@ static jmethodID
 	  clazz = clazz->getSuperclass ();
 	}
 
-      env->ex = new java::lang::NoSuchMethodError ();
+      java::lang::StringBuffer *name_sig =
+        new java::lang::StringBuffer (JvNewStringUTF (name));
+      name_sig->append ((jchar) ' ')->append (JvNewStringUTF (s));
+      env->ex = new java::lang::NoSuchMethodError (name_sig->toString ());
     }
   catch (jthrowable t)
     {