diff --git a/_emulator b/_emulator
index 402baf1..71e2349 100644
--- a/_emulator
+++ b/_emulator
@@ -47,6 +47,7 @@ typeset -A opt_args
 local context state line curcontext="$curcontext"
 
 _emulator() {
+
   # TODO All image options are contextual to -sysdir value
   # TODO All skin options are contextual to -skindir value
   # TODO snapshot options are mutually exclusive
@@ -55,7 +56,6 @@ _emulator() {
   # TODO -logcat: use completer from _adb
   # TODO Complete options with device values
   # TODO Complete -prop
-  # TODO -debug-<tag> / -debug-no-<tag>
   _arguments \
     '(- : *)-version[display emulator version number]' \
     '(- : *)-help[display help information]' \
@@ -133,9 +133,7 @@ _emulator() {
     '-memcheck[enable memory access checking]:flags' \
     '-qemu[pass arguments to qemu]:arguments' \
     '-verbose[same as '\''-debug-init'\'']' \
-    '-debug[enable/disable debug messages]:tags' \
-    '-debug-<tag>[enable specific debug messages]' \
-    '-debug-no-<tag>[disable specific debug messages]'
+    '*'{-debug,-debug-,-debug-no-}'[enable/disable specific debug messages]:tag'
 }
 
 _emulator "$@"