diff --git a/ChangeLog b/ChangeLog
index 7aeb7247a7..23c365104e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 12 18:25:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
+	  character literal (1 char string).
+
+	* lib/mkmf.rb: shut up some warnings from tk's extconf.rb.
+
 Thu Oct 12 02:15:24 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 1c57b18f2a..0b2597ec1a 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -1359,8 +1359,8 @@ cbsubst_table_setup(self, key_inf, proc_inf)
     for(idx = 0; idx < len; idx++) {
         inf = RARRAY_PTR(key_inf)[idx];
         if (TYPE(inf) != T_ARRAY) continue;
-        *(key  + real_len) = (char)NUM2INT(RARRAY_PTR(inf)[0]);
-        *(type + real_len) = (char)NUM2INT(RARRAY_PTR(inf)[1]);
+        *(key  + real_len) = NUM2CHR(RARRAY_PTR(inf)[0]);
+        *(type + real_len) = NUM2CHR(RARRAY_PTR(inf)[1]);
 
         *(ivar + real_len) 
             = rb_intern(
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5dad67975e..45900fe0f7 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1043,6 +1043,7 @@ def configuration(srcdir)
       CONFIG['PATH_SEPARATOR'] = ';'
     end
   end
+  CONFIG["hdrdir"] ||= $hdrdir
   mk << %{
 SHELL = /bin/sh
 
@@ -1107,7 +1108,7 @@ COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
 
 #### End of system configuration section. ####
 
-preload = #{$preload ? $preload.join(' ') : ''}
+preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
 }
   if $nmake == ?b
     mk.each do |x|