diff --git a/src/Application.php b/src/Application.php
index 3242260d9..deb43709c 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -212,8 +212,10 @@ public function getData()
             'help',
             'init',
             'list',
+            'shell',
             'server'
         ];
+
         $languages = $this->container->get('console.configuration_manager')
             ->getConfiguration()
             ->get('application.languages');
diff --git a/src/Bootstrap/AddServicesCompilerPass.php b/src/Bootstrap/AddServicesCompilerPass.php
index 2d7d9c2ab..585d2c6c2 100644
--- a/src/Bootstrap/AddServicesCompilerPass.php
+++ b/src/Bootstrap/AddServicesCompilerPass.php
@@ -111,6 +111,17 @@ public function process(ContainerBuilder $container)
             }
         }
 
+        $configurationManager = $container->get('console.configuration_manager');
+        $directory = $configurationManager->getConsoleDirectory() . 'extend/';
+        $autoloadFile = $directory . 'vendor/autoload.php';
+        if (is_file($autoloadFile)) {
+            include_once $autoloadFile;
+            $extendService = $directory . 'extend.console.services.yml';
+            if (is_file($extendService)) {
+                $loader->load($extendService);
+            }
+        }
+
         $container->setParameter(
             'console.service_definitions',
             $container->getDefinitions()