diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
index 6a322c92954a6..caf3bd15bfbc8 100644
--- a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
+++ b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
@@ -48,7 +48,7 @@ protected function configure()
         $shell = $this->guessShell();
         [$rcFile, $completionFile] = match ($shell) {
             'fish' => ['~/.config/fish/config.fish', "/etc/fish/completions/$commandName.fish"],
-            'zsh' => ['~/.zshrc', '$fpath[1]/'.$commandName],
+            'zsh' => ['~/.zshrc', '$fpath[1]/_'.$commandName],
             default => ['~/.bashrc', "/etc/bash_completion.d/$commandName"],
         };
 
diff --git a/src/Symfony/Component/Console/Resources/completion.zsh b/src/Symfony/Component/Console/Resources/completion.zsh
index 97a9e88cd617c..ff76fe5fa981c 100644
--- a/src/Symfony/Component/Console/Resources/completion.zsh
+++ b/src/Symfony/Component/Console/Resources/completion.zsh
@@ -1,3 +1,5 @@
+#compdef {{ COMMAND_NAME }}
+
 # This file is part of the Symfony package.
 #
 # (c) Fabien Potencier <fabien@symfony.com>