diff --git a/ChangeLog b/ChangeLog
index 320d252a5d..b25e02bcc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 30 01:55:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivmod): remove redundant code.  a patch from
+	  TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in [ruby-dev:36044].
+
 Sat Aug 30 01:37:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI#initialize): remove unused constants.  a patch
diff --git a/bignum.c b/bignum.c
index 14b9b1b762..2c606f8753 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1794,9 +1794,8 @@ bigdivmod(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
-    else {
-	if (divp) *divp = *divp;
-	if (modp) *modp = mod;
+    else if (modp) {
+	*modp = mod;
     }
 }