diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 82a9f182ea56..f8b8ed90e482 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-01  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* gnu/java/lang/MainThread (run): Revert exception chaining change.
+
 2006-05-31  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* prims.cc (_Jv_RunMain): Use JvNewStringUTF for command-line class
diff --git a/libjava/gnu/java/lang/MainThread.java b/libjava/gnu/java/lang/MainThread.java
index 470de0c3a681..5b8b417ad4d6 100644
--- a/libjava/gnu/java/lang/MainThread.java
+++ b/libjava/gnu/java/lang/MainThread.java
@@ -100,6 +100,7 @@ final class MainThread extends Thread
 	catch (ClassNotFoundException x)
 	  {
 	    NoClassDefFoundError ncdfe = new NoClassDefFoundError(klass_name);
+	    ncdfe.initCause(x);
 	    throw ncdfe;
 	  }
       }