diff --git a/ChangeLog b/ChangeLog
index 0eeb52c3c..cbf6198f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-28 Georg Fleischmann <georg@vhf.de>
+
+	* base/Source/NSCalendarDate.m [NSCalendarDate
+	descriptionWithCalendarFormat:locale:]: make milliseconds
+	work (%F)
+
 2001-08-28  Adam Fedor  <fedor@gnu.org>
 
 	* Headers/gnustep/base/objc-gnu2next.h: More defs.
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
index 0a9c47a0f..4cbc60972 100644
--- a/Source/NSCalendarDate.m
+++ b/Source/NSCalendarDate.m
@@ -1334,10 +1334,10 @@ static inline int getDigits(const char *from, char *to, int limit)
 	      s = ([self dayOfCommonEra] - GREGORIAN_REFERENCE) * 86400.0;
 	      s -= (_seconds_since_ref
 		+ [_time_zone secondsFromGMTForDate: self]);
-	      s = abs(s);
+	      s = fabs(s);
 	      s -= floor(s);
 	      ++i;
-	      k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%03d", (int)s*1000));
+	      k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%03d", (int)(s*1000)));
 	      j += k;
 	      break;