diff --git a/ChangeLog b/ChangeLog
index 69af0bdc00..788dd14ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 14 17:54:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_each_words): assume no string exceeds INT_MAX.
+
 Sat Mar 14 15:59:04 2009  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (rb_spawn_internal): use int variable for status.
diff --git a/util.c b/util.c
index 48d403e80c..99e04e7bf2 100644
--- a/util.c
+++ b/util.c
@@ -3816,7 +3816,7 @@ ruby_each_words(const char *str, void (*func)(const char*, int, void*), void *ar
 	if (!*str) break;
 	end = str;
 	while (*end && !ISSPACE(*end) && *end != ',') end++;
-	len = end - str;
+	len = (int)(end - str);	/* assume no string exceeds INT_MAX */
 	(*func)(str, len, arg);
     }
 }