diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index ad8cb2e6e9..474637d6ea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+ * Deprecated the Shell
+
 2.7.0
 -----
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index d10db38f37..b727c2bd1c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -86,6 +86,8 @@ class Application extends BaseApplication
         $this->setDispatcher($container->get('event_dispatcher'));
 
         if (true === $input->hasParameterOption(array('--shell', '-s'))) {
+            @trigger_error('The "--shell" option is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
             $shell = new Shell($this);
             $shell->setProcessIsolation($input->hasParameterOption(array('--process-isolation')));
             $shell->run();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php b/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php
index 80daebd4cd..8a1e407ed2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php
@@ -16,6 +16,8 @@ use Symfony\Component\Console\Shell as BaseShell;
 /**
  * Shell.
  *
+ * @deprecated since version 2.8, to be removed in 3.0.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Shell extends BaseShell
diff --git a/src/Symfony/Component/Console/Shell.php b/src/Symfony/Component/Console/Shell.php
index 9767a6e1a7..0f39069b2e 100644
--- a/src/Symfony/Component/Console/Shell.php
+++ b/src/Symfony/Component/Console/Shell.php
@@ -23,6 +23,8 @@ use Symfony\Component\Process\PhpExecutableFinder;
  * Support for history and completion only works with a PHP compiled
  * with readline support (either --with-readline or --with-libedit)
  *
+ * @deprecated since version 2.8, to be removed in 3.0.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Martin Hasoň <martin.hason@gmail.com>
  */
@@ -44,6 +46,8 @@ class Shell
      */
     public function __construct(Application $application)
     {
+        @trigger_error('The '.__CLASS__.' class is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
         $this->hasReadline = function_exists('readline');
         $this->application = $application;
         $this->history = getenv('HOME').'/.history_'.$application->getName();