diff --git a/lib/completion-templates.ts b/lib/completion-templates.ts
index 27c9e00b6..e77df35c9 100644
--- a/lib/completion-templates.ts
+++ b/lib/completion-templates.ts
@@ -28,14 +28,15 @@ complete -o default -F _yargs_completions {{app_name}}
 ###-end-{{app_name}}-completions-###
 `;
 
-export const completionZshTemplate = `###-begin-{{app_name}}-completions-###
+export const completionZshTemplate = `#compdef {{app_name}}
+###-begin-{{app_name}}-completions-###
 #
 # yargs command completion script
 #
 # Installation: {{app_path}} {{completion_command}} >> ~/.zshrc
 #    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.
 #
-_{{app_name}}_yargs_completions()
+_{{app_name}}()
 {
   local reply
   local si=$IFS
@@ -43,6 +44,6 @@ _{{app_name}}_yargs_completions()
   IFS=$si
   _describe 'values' reply
 }
-compdef _{{app_name}}_yargs_completions {{app_name}}
+compdef _{{app_name}} {{app_name}}
 ###-end-{{app_name}}-completions-###
 `;