diff --git a/misc/bash/_ghq b/misc/bash/_ghq
index 48326280..12eb1535 100644
--- a/misc/bash/_ghq
+++ b/misc/bash/_ghq
@@ -4,13 +4,15 @@ function _ghq () {
 
   case $cword in
   1)
-    COMPREPLY=( $(compgen -W "get list" -- $cur) );;
+    COMPREPLY=( $(compgen -W "get list rm" -- $cur) );;
   2)
     case $prev in
     get)
   	  COMPREPLY=( $(compgen -W "$(ghq list --unique)" -- $cur) );;
     list)
   	  COMPREPLY=( $(compgen -W "$(ghq list)" -- $cur) );;
+    rm)
+  	  COMPREPLY=( $(compgen -W "$(ghq list)" -- $cur) );;
     esac;;
   *)
     COMPREPLY=( $(compgen -W "$(ls)" -- $cur) );;
diff --git a/misc/zsh/_ghq b/misc/zsh/_ghq
index 40ce3194..e75b65f1 100644
--- a/misc/zsh/_ghq
+++ b/misc/zsh/_ghq
@@ -51,6 +51,12 @@ function _ghq () {
                         '(-)*:: :->null_state' \
                         && ret=0
                     ;;
+                (rm)
+                    _arguments -C \
+                        '--dry-run[Do not remove actually]' \
+                        '(-)*:: :->null_state' \
+                        && ret=0
+                    ;;
                 (help|h)
                     __ghq_commands && ret=0
                     ;;