diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index de430ca547c9d..ea2ab928a55ec 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -34,6 +34,10 @@ FrameworkBundle
  * The `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` 
    methods are deprecated since 3.4 and will be removed in 4.0.
 
+ * The `--no-prefix` option of the `translation:update` command is deprecated and
+   will be removed in 4.0. Use the `--prefix` option with an empty string as value
+   instead (e.g. `--prefix=""`)
+
 Process
 -------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index f6547fd0a0403..01321f2a50922 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -345,6 +345,9 @@ FrameworkBundle
  * The `Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory` class has been removed.
    Use `Symfony\Component\Validator\ContainerConstraintValidatorFactory` instead.
 
+ * The `--no-prefix` option of the `translation:update` command has
+   been removed.
+
 HttpFoundation
 --------------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index f88747cfa61f8..0d5b4fb873612 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -39,7 +39,7 @@ protected function configure()
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages, defaults to app/Resources folder'),
                 new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
-                new InputOption('no-prefix', null, InputOption::VALUE_NONE, 'If set, no prefix is added to the translations'),
+                new InputOption('no-prefix', null, InputOption::VALUE_NONE, '[DEPRECATED] If set, no prefix is added to the translations'),
                 new InputOption('output-format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'yml'),
                 new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Should the update be done'),
@@ -135,7 +135,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
         $errorIo->comment('Parsing templates...');
         $extractor = $this->getContainer()->get('translation.extractor');
-        $extractor->setPrefix($input->getOption('no-prefix') ? '' : $input->getOption('prefix'));
+        $prefix = $input->getOption('prefix');
+        // @deprecated since version 3.4, to be removed in 4.0 along with the --no-prefix option
+        if ($input->getOption('no-prefix')) {
+            @trigger_error('The "--no-prefix" option is deprecated since version 3.4 and will be removed in 4.0. Use the "--prefix" option with an empty string as value instead.', E_USER_DEPRECATED);
+            $prefix = '';
+        }
+        $extractor->setPrefix($prefix);
         foreach ($transPaths as $path) {
             $path .= 'views';
             if (is_dir($path)) {