diff --git a/ChangeLog b/ChangeLog
index c289db6626..dc63297563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+        * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
+
 Thu Mar  3 23:24:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 714a1fc44a..128e28e762 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -41,7 +41,7 @@
 ***********************************************************************/
 /* $Id$ */
 #define NKF_VERSION "2.0.4"
-#define NKF_RELEASE_DATE "2005-02-20"
+#define NKF_RELEASE_DATE "2005-03-04"
 #include "config.h"
 
 static char *CopyRight =
@@ -2197,6 +2197,13 @@ kanji_convert(f)
 
     /* epilogue */
     (*iconv)(EOF, 0, 0);
+    if (!is_inputcode_set)
+	set_input_codename(
+	    iconv == e_iconv ? "EUC-JP" :
+	    iconv == s_iconv ? "Shift_JIS" :
+	    iconv == w_iconv ? "UTF-8" :
+	    iconv == w_iconv16 ? "UTF-16" :
+	    "ASCII");
     return 1;
 }