diff --git a/ChangeLog b/ChangeLog
index ec816cf52b..4c9fcbf3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug  7 00:42:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/tk/lib/tk/wm.rb (Tk::Wm.command): Add the missing receiver
+	  before calling epath. patched by flori
+	  https://github.com/flori/ruby/commit/aa9474d32e5f2c57f8b0e2e0c528a03f06a4d433
+
 Sat Aug  6 07:06:34 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* marshal.c (w_object):  Fix exception message when _dump_data is not
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
index b1a2ed886a..fcd5a2cbd2 100644
--- a/ext/tk/lib/tk/wm.rb
+++ b/ext/tk/lib/tk/wm.rb
@@ -83,11 +83,11 @@ module Tk
 
     def Wm.command(win, value=nil)
       if value
-        tk_call('wm', 'command', epath, value)
+        tk_call('wm', 'command', win.epath, value)
         win
       else
-        #procedure(tk_call('wm', 'command', epath))
-        tk_call('wm', 'command', epath)
+        #procedure(tk_call('wm', 'command', win.epath))
+        tk_call('wm', 'command', win.epath)
       end
     end
     def wm_command(value=nil)