diff --git a/ChangeLog b/ChangeLog
index e171dcfb36..7a360346a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 24 13:33:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (HAVE_LONG_LONG, HAVE_OFF_T): revised for autoconf
+	  2.62 or later.
+
 Wed Dec 24 06:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (OBJDUMP, OBJCOPY): autoconf list is not comma
diff --git a/configure.in b/configure.in
index 98019dea1e..7547dd94b4 100644
--- a/configure.in
+++ b/configure.in
@@ -281,6 +281,8 @@ mingw*)
 	;;
 esac
 
+AC_CHECK_TYPES([long long, off_t])
+
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(long, 4)
@@ -292,9 +294,6 @@ AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(time_t, 0)
 
-[test "${ac_cv_type_long_long}" = yes] && AC_DEFINE(HAVE_LONG_LONG)
-[test "${ac_cv_type_off_t}" = yes] && AC_DEFINE(HAVE_OFF_T)
-
 dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
 AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
     AC_CHECK_TYPE([$1],