diff --git a/src/_brew b/src/_brew
index 37a95e5..3940c05 100644
--- a/src/_brew
+++ b/src/_brew
@@ -30,6 +30,10 @@ _brew_installed_formulae() {
   installed_formulae=(${(f)"$(_call_program formulae brew list 2>/dev/null)"})
 }
 
+_brew_installed_taps() {
+  installed_taps=(${(f)"$(_call_program formulae brew tap 2>/dev/null)"})
+}
+
 _brew_outdated_formulae() {
   outdated_formulae=(${(f)"$(_call_program formulae brew outdated 2>/dev/null)"})
 }
@@ -70,7 +74,7 @@ _1st_arguments=(
 )
 
 local expl
-local -a formulae installed_formulae outdated_formulae
+local -a formulae installed_formulae installed_taps outdated_formulae
 
 _arguments \
   '(-v)-v[verbose]' \
@@ -119,6 +123,9 @@ case "$words[1]" in
   upgrade)
     _brew_outdated_formulae
     _wanted outdated_formulae expl 'outdated formulae' compadd -a outdated_formulae ;;
+  untap)
+    _brew_installed_taps
+    _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;;
 esac
 
 # Local Variables: