diff --git a/ChangeLog b/ChangeLog
index 3143c699d7..7f09a4b77d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 14 13:38:01 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with
+	  VC++8.
+
 Tue Feb 14 11:42:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* time.c (search_time_t): support non 32bit time_t environments.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d6e4780709..8039fc8629 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -221,6 +221,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
 #define HAVE_STDLIB_H 1
 #define HAVE_STRING_H 1
 #define HAVE_MEMORY_H 1
+!if $(MSC_VER) >= 1400
+#define HAVE_LONG_LONG 1
+!endif
 #define HAVE_OFF_T 1
 #define SIZEOF_INT 4
 #define SIZEOF_SHORT 2