diff --git a/ChangeLog b/ChangeLog
index 93a0a91187c843..3bef371bc8410e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 14 14:52:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort()
+	  instead of num2uint().
+
 Sun Nov 13 10:31:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* include/ruby/ruby.h: add #ifdef comment.
diff --git a/numeric.c b/numeric.c
index d3643fd4551776..e749a396d22920 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2019,7 +2019,7 @@ rb_fix2ushort(VALUE val)
     unsigned long num;
 
     if (!FIXNUM_P(val)) {
-	return rb_num2uint(val);
+	return rb_num2ushort(val);
     }
     num = FIX2ULONG(val);