diff --git a/ChangeLog b/ChangeLog
index eced2dc54e..d2c4a0ae4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 27 07:38:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/rb_optparse.zsh: add compdef for generator.
+
 Mon Dec 27 07:32:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/optparse.rb (OptionParser#compsys): escape brackets too.
diff --git a/misc/rb_optparse.zsh b/misc/rb_optparse.zsh
index 46662cc88a..d53170c5f7 100755
--- a/misc/rb_optparse.zsh
+++ b/misc/rb_optparse.zsh
@@ -31,6 +31,8 @@ generate-complete-function/ruby/optparse ()
     fi
 }
 
+compdef _command generate-complete-function/ruby/optparse
+
 for cmd in "$@"; do
     generate-complete-function/ruby/optparse "$cmd"
 done