diff --git a/ChangeLog b/ChangeLog
index c6676bc7ba..96bc386f86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 10 10:37:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (_HAVE_SANE_QUAD_): if a certain platform has LONG_LONG in
+	  8 byte, it might be sane quad. [ruby-core:33634]
+
 Fri Dec 10 10:07:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/http.rb: remove version 1.1 features.
diff --git a/sprintf.c b/sprintf.c
index 21509eafdd..25633e0490 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -1121,6 +1121,10 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
 #  define quad_t LONG_LONG
 #  define u_quad_t unsigned LONG_LONG
 # endif
+#elif  SIZEOF_LONG_LONG == 8
+#  define _HAVE_SANE_QUAD_
+#  define quad_t LONG_LONG
+#  define u_quad_t unsigned LONG_LONG
 #endif
 #define FLOATING_POINT 1
 #define BSD__dtoa ruby_dtoa