diff --git a/core/command/app/listapps.php b/core/command/app/listapps.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc471c5453a4a42d5ee2fefb24dc983c09d19ae6
--- /dev/null
+++ b/core/command/app/listapps.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\App;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ListApps extends Command {
+	protected function configure() {
+		$this
+			->setName('app:list')
+			->setDescription('List all available apps');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$apps = \OC_App::getAllApps();
+		$enabledApps = array();
+		$disabledApps = array();
+
+		//sort enabled apps above disabled apps
+		foreach ($apps as $app) {
+			if (\OC_App::isEnabled($app)) {
+				$enabledApps[] = $app;
+			} else {
+				$disabledApps[] = $app;
+			}
+		}
+
+		sort($enabledApps);
+		sort($disabledApps);
+		$output->writeln('Enabled:');
+		foreach ($enabledApps as $app) {
+			$output->writeln(' - ' . $app);
+		}
+		$output->writeln('Disabled:');
+		foreach ($disabledApps as $app) {
+			$output->writeln(' - ' . $app);
+		}
+	}
+}
diff --git a/core/register_command.php b/core/register_command.php
index 9ca2a8660bdbec41f5f1af19b25f41dbb0f372b8..144dcd3dc5d5643bbf1e9f3ebd6b73b9bc7e6ddf 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -12,3 +12,4 @@ $application->add(new OC\Core\Command\Db\GenerateChangeScript());
 $application->add(new OC\Core\Command\Upgrade());
 $application->add(new OC\Core\Command\App\Disable());
 $application->add(new OC\Core\Command\App\Enable());
+$application->add(new OC\Core\Command\App\ListApps());