diff --git a/src/Symfony/Component/Console/Completion/Output/FishCompletionOutput.php b/src/Symfony/Component/Console/Completion/Output/FishCompletionOutput.php
index d2c414e487511..356a974ea0e00 100644
--- a/src/Symfony/Component/Console/Completion/Output/FishCompletionOutput.php
+++ b/src/Symfony/Component/Console/Completion/Output/FishCompletionOutput.php
@@ -21,11 +21,14 @@ class FishCompletionOutput implements CompletionOutputInterface
 {
     public function write(CompletionSuggestions $suggestions, OutputInterface $output): void
     {
-        $values = $suggestions->getValueSuggestions();
+        $values = [];
+        foreach ($suggestions->getValueSuggestions() as $value) {
+            $values[] = $value->getValue().($value->getDescription() ? "\t".$value->getDescription() : '');
+        }
         foreach ($suggestions->getOptionSuggestions() as $option) {
-            $values[] = '--'.$option->getName();
+            $values[] = '--'.$option->getName().($option->getDescription() ? "\t".$option->getDescription() : '');
             if ($option->isNegatable()) {
-                $values[] = '--no-'.$option->getName();
+                $values[] = '--no-'.$option->getName().($option->getDescription() ? "\t".$option->getDescription() : '');
             }
         }
         $output->write(implode("\n", $values));
diff --git a/src/Symfony/Component/Console/Resources/completion.fish b/src/Symfony/Component/Console/Resources/completion.fish
index 1c34292aeea7b..1853dd80f09ed 100644
--- a/src/Symfony/Component/Console/Resources/completion.fish
+++ b/src/Symfony/Component/Console/Resources/completion.fish
@@ -19,11 +19,7 @@ function _sf_{{ COMMAND_NAME }}
 
     set completecmd $completecmd "-c$c"
 
-    set sfcomplete ($completecmd)
-
-    for i in $sfcomplete
-        echo $i
-    end
+    $completecmd
 end
 
 complete -c '{{ COMMAND_NAME }}' -a '(_sf_{{ COMMAND_NAME }})' -f
diff --git a/src/Symfony/Component/Console/Tests/Completion/Output/FishCompletionOutputTest.php b/src/Symfony/Component/Console/Tests/Completion/Output/FishCompletionOutputTest.php
index 2e615d04016ee..93456e1388035 100644
--- a/src/Symfony/Component/Console/Tests/Completion/Output/FishCompletionOutputTest.php
+++ b/src/Symfony/Component/Console/Tests/Completion/Output/FishCompletionOutputTest.php
@@ -23,11 +23,11 @@ public function getCompletionOutput(): CompletionOutputInterface
 
     public function getExpectedOptionsOutput(): string
     {
-        return "--option1\n--negatable\n--no-negatable";
+        return "--option1\tFirst Option\n--negatable\tCan be negative\n--no-negatable\tCan be negative";
     }
 
     public function getExpectedValuesOutput(): string
     {
-        return "Green\nRed\nYellow";
+        return "Green\tBeans are green\nRed\tRose are red\nYellow\tCanaries are yellow";
     }
 }