diff --git a/ChangeLog b/ChangeLog
index e5d8523d3f..51f506c778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr  5 14:50:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
+	  [Bug #12202] [ruby-core:74802]
+
 Tue Apr  5 00:06:44 2016  Aeris  <aeris@imirhil.fr>
 
 	* ext/openssl/ossl_ssl.c (ossl_ssl_tmp_key): Access to ephemeral
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index fd3ce292c2..b58c437d3c 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -5436,7 +5436,7 @@ mime_putc(nkf_char c)
 		mimeout_state.buf[mimeout_state.count++] = (char)c;
 		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
 		    eof_mime();
-		    for (j=0;i<mimeout_state.count;j++) {
+		    for (j=0;j<mimeout_state.count;j++) {
 			(*o_mputc)(mimeout_state.buf[j]);
 			base64_count++;
 		    }