diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 219b74fc54ab6f3a18535163b32dff0e83156168..2dcdd5ee40e4bfee9e8853c480e43d7121d853b2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-09  Dalibor Topic  <robilad@kaffe.org>
+
+	* java/text/DateFormat.java (parse):
+	Improved javadoc. Improved exception message.
+
 2004-07-09  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/nio/SelectorImpl.java (select): Call static Thread
diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java
index 3b489fae7eb2692be8040082531ab78a6f422756..81427ebce61c1e4fa1e14f11140da2571e39b43c 100644
--- a/libjava/java/text/DateFormat.java
+++ b/libjava/java/text/DateFormat.java
@@ -1,5 +1,6 @@
 /* DateFormat.java -- Class for formatting/parsing date/times
-   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -591,6 +592,7 @@ public abstract class DateFormat extends Format implements Cloneable
   /**
    * This method parses the specified date/time string.
    *
+   * @param source The string to parse.
    * @return The resultant date.
    *
    * @exception ParseException If the specified string cannot be parsed.
@@ -604,7 +606,8 @@ public abstract class DateFormat extends Format implements Cloneable
 	int index = pos.getErrorIndex();
 	if (index < 0)
 	  index = pos.getIndex();
-	throw new ParseException("invalid Date syntax", index);
+	throw new ParseException("invalid Date syntax in \""
+				 + source + '\"', index);
       }
     return result;
   }