diff --git a/ChangeLog b/ChangeLog
index 7d420259d4..db1e1d6ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
+	  should call Kernel.eval on caller's safe-level instead of slave's 
+	  safe-level (Of course, the given script should be evaluated on 
+	  slave's safe-level).
+
 Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index fd1b511e05..d10e304a3d 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1577,8 +1577,8 @@ class MultiTkIp
 
     eval_proc_core(true, 
                    proc{|safe| 
-                     $SAFE=safe if $SAFE < safe
-                     Kernel.eval(cmd, *eval_args)
+                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                 *eval_args)
                    })
   end
   alias eval_str eval_string
@@ -1591,8 +1591,8 @@ class MultiTkIp
     Thread.new{
       eval_proc_core(true, 
                      proc{|safe| 
-                       $SAFE=safe if $SAFE < safe
-                       Kernel.eval(cmd, *eval_args)
+                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                   *eval_args)
                      })
     }
   end
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 0c88b0ac89..c3e92f4097 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4437,7 +4437,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2005-09-16'.freeze
+  RELEASE_DATE = '2005-09-17'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'