diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bc8537271f7..d62eaa44148 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-01  Bryce McKinlay  <mckinlay@redhat.com>
+
+	PR libgcj/18699
+	* testsuite/libjava.lang/PR18699.java, 
+	testsuite/libjava.lang/PR18699.out: New test.
+
 2004-11-30  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage variants):
diff --git a/libjava/testsuite/libjava.lang/PR18699.java b/libjava/testsuite/libjava.lang/PR18699.java
new file mode 100644
index 00000000000..6f81e10d9f3
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR18699.java
@@ -0,0 +1,36 @@
+// Test for thread-local allocation problems.
+
+import java.util.HashMap;
+import java.util.Observable;
+import java.util.Observer;
+
+class PR18699 extends Observable implements Runnable, Observer {
+
+  public static void main(String[] args) throws InterruptedException {
+    PR18699 PR18699_1 = new PR18699();
+    PR18699 PR18699_2 = new PR18699();
+    PR18699_1.addObserver(PR18699_2);
+    PR18699_2.addObserver(PR18699_1);
+    new Thread(PR18699_1).start();
+    new Thread(PR18699_2).start();
+  }
+
+  public void run() {
+    int c = 0;
+    String s = "";
+    while (++c < 50) {
+      this.setChanged();
+      s = "";
+      for (int i = 0; i < 200; i++)
+        s += String.valueOf(i);
+      this.notifyObservers(s);
+    }
+  }
+
+  HashMap map = new HashMap();
+  
+  public void update(Observable o, Object obj) 
+  {
+    map.put(o, obj);
+  }
+}
diff --git a/libjava/testsuite/libjava.lang/PR18699.out b/libjava/testsuite/libjava.lang/PR18699.out
new file mode 100644
index 00000000000..e69de29bb2d