diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 27667e372a1..b158a95c9ec 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-03 Mark Wielaard <mark@klomp.org>
+
+	* java/util/Timer (TaskQueue.stop): set elements to zero.
+
 2002-02-28  Anthony Green  <green@redhat.com>
 
 	* java/lang/reflect/natMethod.cc (result): Add void* element.
diff --git a/libjava/java/util/Timer.java b/libjava/java/util/Timer.java
index 03ec937d606..38c4dc09f57 100644
--- a/libjava/java/util/Timer.java
+++ b/libjava/java/util/Timer.java
@@ -293,6 +293,7 @@ public class Timer
     public synchronized void stop()
     {
       this.heap = null;
+      this.elements = 0;
       this.notify();
     }