diff --git a/ChangeLog b/ChangeLog
index d22ab723f..5d7853b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 31 15:47:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+        * Source/NSTimer.m: Set minimum timeout to 0.01s rather than 1.0s.
+        This seems a more reasonable value - a 1 second delay is too big.
+
 Wed Aug 25 17:08:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Fixes for memory leak in property-list parsing and in NSTimeZone
diff --git a/Source/NSTimer.m b/Source/NSTimer.m
index 789f57b57..bcb09a161 100644
--- a/Source/NSTimer.m
+++ b/Source/NSTimer.m
@@ -38,7 +38,7 @@
                repeats: (BOOL)f
 {
   if (seconds <= 0)
-    seconds = 1;
+    seconds = 0.01;
   _interval = seconds;
   _date = [[NSDate allocWithZone: [self zone]]
     initWithTimeIntervalSinceNow: seconds];