diff --git a/console.php b/console.php
index 4aec5bdc24..a2d4ab3562 100644
--- a/console.php
+++ b/console.php
@@ -20,17 +20,32 @@ if (!OC::$CLI) {
 	exit(0);
 }
 
+$self = basename($argv[0]);
 if ($argc <= 1) {
-	echo "Usage:" . PHP_EOL;
-	echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
-	exit(0);
+        $argv[1] = "help";
 }
 
 $command = $argv[1];
 array_shift($argv);
 
-if ($command === 'files:scan') {
-	require_once 'apps/files/console/scan.php';
-} else {
-	echo "Unknown command '$command'" . PHP_EOL;
+switch ($command) {
+        case 'files:scan':
+                require_once 'apps/files/console/scan.php';
+                break;
+        case 'status':
+                require_once 'status.php';
+                break;
+        case 'help':
+                echo "Usage:" . PHP_EOL;
+                echo " " . $self . " <command>" . PHP_EOL; 
+                echo PHP_EOL;
+                echo "Available commands:" . PHP_EOL;
+                echo " files:scan -> rescan filesystem" .PHP_EOL;
+                echo " status -> show some status information" .PHP_EOL;
+                echo " help -> show this help screen" .PHP_EOL;
+                break;
+        default:
+                echo "Unknown command '$command'" . PHP_EOL;
+                echo "For available commands type ". $self . " help" . PHP_EOL;
+                break;
 }