diff --git a/ChangeLog b/ChangeLog
index 12500418b4..737b6501a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov  9 11:28:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): add -Wno-long-long.
+
 Mon Nov  9 01:55:10 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* eval.c (method_inspect, method_name, mnew): Bug fix when
diff --git a/configure.in b/configure.in
index 86d9fb9264..6869b03ceb 100644
--- a/configure.in
+++ b/configure.in
@@ -165,7 +165,7 @@ AC_PROG_GCC_TRADITIONAL
 test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
 if test "$GCC" = yes; then
     linker_flag=-Wl,
-    : ${optflags=-O2} ${warnflags="-Wall -Wno-parentheses"}
+    : ${optflags=-O2} ${warnflags="-Wall -Wno-parentheses -Wno-long-long"}
 else
     linker_flag=
 fi