diff --git a/ChangeLog b/ChangeLog
index 7d6700da4f..bc8d7b1ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 27 19:26:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
+	  rb_nkf_guess2): Silence warnings regarding char * vs. unsigned
+	  char * mismatch; submitted by Lyle Johnson
+	  <lyle.johnson@gmail.com> in [ruby-core:10416].
+
 Tue Feb 27 19:15:01 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index e12df16960..1cc582ac1a 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -62,7 +62,7 @@ rb_nkf_putchar(unsigned int c)
     o_len += incsize;
     rb_str_resize(result, o_len);
     incsize *= 2;
-    output = RSTRING_PTR(result);
+    output = (unsigned char *)RSTRING_PTR(result);
   }
   output[output_ctr++] = c;
 
@@ -155,13 +155,13 @@ rb_nkf_kconv(VALUE obj, VALUE opt, VALUE src)
 
   input_ctr = 0;
   StringValue(src);
-  input = RSTRING_PTR(src);
+  input = (unsigned char *)RSTRING_PTR(src);
   i_len = RSTRING_LEN(src);
   result = rb_str_new(0, i_len*3 + 10);
   v = result;
 
   output_ctr = 0;
-  output     = RSTRING_PTR(result);
+  output     = (unsigned char *)RSTRING_PTR(result);
   o_len      = RSTRING_LEN(result);
   *output    = '\0';
 
@@ -208,7 +208,7 @@ rb_nkf_guess1(VALUE obj, VALUE src)
   int sequence_counter = 0;
 
   StringValue(src);
-  p = RSTRING_PTR(src);
+  p = (unsigned char *)RSTRING_PTR(src);
   pend = p + RSTRING_LEN(src);
   if (p == pend) return INT2FIX(_UNKNOWN);
 
@@ -324,7 +324,7 @@ rb_nkf_guess2(VALUE obj, VALUE src)
 
   input_ctr = 0;
   StringValue(src);
-  input = RSTRING_PTR(src);
+  input = (unsigned char *)RSTRING_PTR(src);
   i_len = RSTRING_LEN(src);
 
   if(x0201_f == WISH_TRUE)