diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2e34c9a2ea1cc435e18183961d4d75a44aec58ea..5b447eeea6e65b845c2381bfd0ead3f013b273d5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-25  Mark Wielaard  <mark@klomp.org>
+
+	* java/lang/natRuntime.cc (_load): Add library name to
+	UnsatisfiedLinkError when thrown.
+
 2003-07-25  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am (awt_java_source_files): java/awt/GridBagLayoutInfo.java
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 69f78f64491417fb05db4b83df2fbe7b3226fd99..878fccba4aa4234f7b250020a11194171265cdfd 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -217,7 +217,8 @@ java::lang::Runtime::_load (jstring path, jboolean do_search)
   if (h == NULL)
     {
       const char *msg = lt_dlerror ();
-      jstring str = path->concat (JvNewStringLatin1 (": "));
+      jstring str = JvNewStringLatin1 (lib_name);
+      str = str->concat (JvNewStringLatin1 (": "));
       str = str->concat (JvNewStringLatin1 (msg));
       throw new UnsatisfiedLinkError (str);
     }