diff --git a/ChangeLog b/ChangeLog
index 67fc342247..a3ac4c5df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 15 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
+
 Mon Jun 14 18:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/remote-tk.rb: bug fix
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 5ac6724b84..8462c3064c 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2706,6 +2706,9 @@ class TkWindow<TkObject
     end
 
     case opt
+    when 'set', :set
+      tk_call_without_enc('grab', 'set', path)
+      return self
     when 'global', :global
       #return(tk_call('grab', 'set', '-global', path))
       tk_call_without_enc('grab', 'set', '-global', path)
@@ -2719,22 +2722,26 @@ class TkWindow<TkObject
     when 'status', :status
       return tk_call_without_enc('grab', 'status', path)
     else
-      return tk_call_without_enc('grab', args[0], path)
+      return tk_call_without_enc('grab', opt, path)
     end
   end
 
   def grab_current
     grab('current')
   end
+  alias current_grab grab_current
   def grab_release
     grab('release')
   end
+  alias release_grab grab_release
   def grab_set
     grab('set')
   end
+  alias set_grab grab_set
   def grab_set_global
     grab('global')
   end
+  alias set_global_grab grab_set_global
   def grab_status
     grab('status')
   end