diff --git a/ChangeLog b/ChangeLog
index f5eabdc91b..13867da5b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 18 09:00:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (INTEGER2VALUE): Use LONG2FIX if possible.
+
 Sat May 18 00:38:47 2013  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/mkconstants.rb: Convert integer constants bigger than int
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 43de36c18c..521aa95547 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -280,9 +280,13 @@ result = ERB.new(<<'EOS', nil, '%').result(binding)
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
 
 #ifdef HAVE_LONG_LONG
-#define INTEGER2VALUE(n) ((n) <= 0 ? LL2NUM(n) : ULL2NUM(n))
+#define INTEGER2VALUE(n) (0 < (n) ? \
+    ((n) <= FIXNUM_MAX ? LONG2FIX(n) : ULL2NUM(n)) : \
+    (FIXNUM_MIN <= (n) ? LONG2FIX(n) : LL2NUM(n)))
 #else
-#define INTEGER2VALUE(n) ((n) <= 0 ? LONG2NUM(n) : ULONG2NUM(n))
+#define INTEGER2VALUE(n) (0 < (n) ? \
+    ((n) <= FIXNUM_MAX ? LONG2FIX(n) : ULONG2NUM(n)) : \
+    (FIXNUM_MIN <= (n) ? LONG2FIX(n) : LONG2NUM(n)))
 #endif
 
 static void