diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 14a105a5c9c..eb7f0dea951 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-07  Mark Wielaard  <mark@klomp.org>
+
+	* java/text/MessageFormat.java (scanFormat): Chain thrown exception.
+
 2005-01-15  Michael Koch  <konqueror@gmx.de>
 
 	PR libgcj/19444
diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java
index 787bc6ffea6..171fffe6d25 100644
--- a/libjava/java/text/MessageFormat.java
+++ b/libjava/java/text/MessageFormat.java
@@ -283,7 +283,9 @@ public class MessageFormat extends Format
       }
     catch (NumberFormatException nfx)
       {
-	throw new IllegalArgumentException("Failed to parse integer string");
+	IllegalArgumentException iae = new IllegalArgumentException(pat);
+	iae.initCause(nfx);
+	throw iae;
       }
 
     // Extract the element format.