diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 7e3202d86b..f61ed5f87f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -6,6 +6,7 @@ imports:
     - { resource: avatars.yml }
     - { resource: feed.yml }
     - { resource: auth_providers.yml }
+    - { resource: console.yml }
 
 services:
     acl.permissions:
diff --git a/phpBB/console.php b/phpBB/console.php
index 8699ea7b57..94f6c551fa 100644
--- a/phpBB/console.php
+++ b/phpBB/console.php
@@ -28,7 +28,11 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 
+$phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$phpbb_root_path/config");
+
 $application = new Application('phpBB Console', PHPBB_VERSION);
-$application->addCommands(array(
-));
+foreach($phpbb_container->findTaggedServiceIds('console.command') as $id => $void)
+{
+	$application->add($phpbb_container->get($id));
+}
 $application->run();