diff --git a/ChangeLog b/ChangeLog
index 2fc6dffb6f..5e05641d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 12 04:31:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
+
 Fri Jan 11 23:22:31 2008  Tanaka Akira  <akr@fsij.org>
 
 	* string.c (string.c): call rb_str_buf_append to update encoding of
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 431027b574..54f690a954 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -2045,6 +2045,8 @@ void options(unsigned char *cp)
             } else if (*cp=='0') {
                 mime_decode_f = FALSE;
                 mime_f = FALSE; cp++;
+            } else {
+                mime_f = STRICT_MIME;
             }
             continue;
         case 'M':   /* MIME output */