diff --git a/autocompletion/_cheat.zsh b/autocompletion/_cheat.zsh
new file mode 100644
index 0000000..be33b0b
--- /dev/null
+++ b/autocompletion/_cheat.zsh
@@ -0,0 +1,5 @@
+#compdef cheat
+
+declare -a cheats
+cheats=$(cheat -l | cut -d' ' -f1)
+_arguments "1:cheats:(${cheats})" && return 0
diff --git a/autocompletion/cheat.zsh b/autocompletion/cheat.zsh
deleted file mode 100644
index 0ebec18..0000000
--- a/autocompletion/cheat.zsh
+++ /dev/null
@@ -1,12 +0,0 @@
-#compdef cheat
-
-declare -a cheats cheats_in_this_dir
-
-for directory in $(cheat --cheat_directories); do
-    cheats_in_this_dir=($directory/*(N:r:t))
-    [[ ${#cheats_in_this_dir} > 0 ]] && cheats+=($cheats_in_this_dir)
-done
-
-_arguments "1:cheats:(${cheats})"
-
-return 1
diff --git a/setup.py b/setup.py
index 663abbe..188831c 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,6 @@ setup(name='cheat',
       package_data={'cheatsheets': [f for f in os.listdir('cheatsheets')
                                     if '.' not in f]},
       scripts=['cheat'],
-      data_files=[('/usr/share/zsh/site-functions', ['autocompletion/cheat.zsh']),
+      data_files=[('/usr/share/zsh/site-functions', ['autocompletion/_cheat.zsh']),
                   ('/etc/bash_completion.d'       , ['autocompletion/cheat.bash'])]
      )