diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 159789a5eda..2816d01c6cc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,9 @@
 2000-10-24  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	* java/util/EventObject.java: Merged from classpath.
+	
+	* java/lang/ThreadGroup.java (uncaughtException): Print thread name
+	with stack dump.
 
 2000-10-23  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
@@ -263,7 +266,6 @@
 
 	* gnu/gcj/convert/natIconv.cc (init): Terminate buffer.
 
->>>>>>> 1.515
 2000-10-02  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	* prims.cc (_Jv_argv, _Jv_argc): New fields.
diff --git a/libjava/java/lang/ThreadGroup.java b/libjava/java/lang/ThreadGroup.java
index 52c69525098..cf1e7171ccb 100644
--- a/libjava/java/lang/ThreadGroup.java
+++ b/libjava/java/lang/ThreadGroup.java
@@ -500,6 +500,8 @@ public class ThreadGroup
       parent.uncaughtException (thread, t);
     else if (! (t instanceof ThreadDeath))
       {
+        if (thread != null)
+          System.out.print("Exception in thread \"" + thread.getName() + "\" ");
 	t.printStackTrace();
 	had_uncaught_exception = true;
       }