diff --git a/ChangeLog b/ChangeLog
index 3d4e09679..2f5f0ab69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSCalendarDate.m: Fix to parse timezone names as being
+	whitespace delimited.
+
 2006-11-19  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSAffineTransform.m: Adapted from old gui code
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
index ee1020a36..5bc0ef83e 100644
--- a/Source/NSCalendarDate.m
+++ b/Source/NSCalendarDate.m
@@ -1183,8 +1183,7 @@ static inline int getDigits(const char *from, char *to, int limit, BOOL *error)
 	      case 'Z':
 		for (tmpIdx = sourceIdx; tmpIdx < sourceLen; tmpIdx++)
 		  {
-		    if (isalpha(source[tmpIdx]) || source[tmpIdx] == '-'
-		      || source[tmpIdx] == '+')
+		    if (!isspace(source[tmpIdx]))
 		      {
 			tmpStr[tmpIdx - sourceIdx] = source[tmpIdx];
 		      }