diff --git a/ChangeLog b/ChangeLog
index a74ca4c3b2..2065b0d0da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 20 22:29:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_uint2big): Refactored.
+
 Thu Jun 20 22:24:41 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (dump_bignum): Use SIZEOF_BDIGITS.
diff --git a/bignum.c b/bignum.c
index c39dcfda92..b0dc48c59b 100644
--- a/bignum.c
+++ b/bignum.c
@@ -336,21 +336,17 @@ rb_big_norm(VALUE x)
 VALUE
 rb_uint2big(VALUE n)
 {
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
+    BDIGIT *digits = BDIGITS(big);
 
 #if SIZEOF_BDIGITS >= SIZEOF_VALUE
-    big = bignew(1, 1);
-    digits = BDIGITS(big);
     digits[0] = n;
 #else
-    BDIGIT_DBL num = n;
-    big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
-    digits = BDIGITS(big);
-    while (i < bdigit_roomof(SIZEOF_VALUE)) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+    i = 0;
+    for (i = 0; i < bdigit_roomof(SIZEOF_VALUE); i++) {
+	digits[i] = BIGLO(n);
+	n = BIGDN(n);
     }
 #endif