diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 81922f2655cdd74a119ee8d3d02f48ffe0fc2ed8..52ac71c667bcc3605dc2d0308bbf82cf3ff4aa3b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-02  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* java/sql/Timestamp.java (valueOf): Synchronize access to dateFormat.
+
 2004-08-02  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* testsuite/libjava.compile/PR16701.java: New test.
diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java
index e480fff6be88238a5f498e2ee657fe14289d3873..b791ca1e0f2e61fbf0bdce82f24986eea73dd49e 100644
--- a/libjava/java/sql/Timestamp.java
+++ b/libjava/java/sql/Timestamp.java
@@ -99,7 +99,11 @@ public class Timestamp extends java.util.Date
 
     try
       {
-	java.util.Date d = (java.util.Date) dateFormat.parseObject(str);
+        java.util.Date d;
+        synchronized (dateFormat)
+	  {
+	    d = (java.util.Date) dateFormat.parseObject(str);
+	  }
 
 	if (d == null)
 	  throw new IllegalArgumentException(str);