diff --git a/ChangeLog b/ChangeLog
index 3d4347d059..63b62fc16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 20 09:26:05 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
+
+	* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
+
 Tue Jan 20 06:48:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (take_items), enum.c (enum_zip): tries to convert to
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index d1d23ebcff..c96392a189 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -841,7 +841,7 @@ nkf_buf_clear(nkf_buf_t *buf)
 }
 
 static void
-nkf_buf_push(nkf_buf_t *buf, unsigned char c)
+nkf_buf_push(nkf_buf_t *buf, nkf_char c)
 {
     if (buf->capa <= buf->len) {
 	exit(EXIT_FAILURE);
@@ -5842,10 +5842,12 @@ options(unsigned char *cp)
 		cp_back = cp;
 		cp = (unsigned char *)long_option[i].alias;
 	    }else{
+#ifndef PERL_XS
 		if (strcmp(long_option[i].name, "help") == 0){
 		    usage();
 		    exit(EXIT_SUCCESS);
 		}
+#endif
 		if (strcmp(long_option[i].name, "ic=") == 0){
 		    enc = nkf_enc_find((char *)p);
 		    if (!enc) continue;