diff --git a/ChangeLog b/ChangeLog
index 3cfe73024a..592208f1c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec  4 10:48:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
+	  sizeof(off_t). 
+
 Mon Dec  4 08:32:25 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
diff --git a/ruby.h b/ruby.h
index 3ec19e1a91..72cdfd1093 100644
--- a/ruby.h
+++ b/ruby.h
@@ -181,6 +181,8 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
 
 #if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
 # define OFFT2NUM(v) LL2NUM(v)
+#elif SIZEOF_OFF_T == SIZEOF_LONG
+# define OFFT2NUM(v) LONG2NUM(v)
 #else
 # define OFFT2NUM(v) INT2NUM(v)
 #endif