diff --git a/console.php b/console.php
index 4aec5bdc24..fbe09d9bb6 100644
--- a/console.php
+++ b/console.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
@@ -20,17 +21,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;
 }
diff --git a/status.php b/status.php
index 179fe3f49f..88422100f1 100644
--- a/status.php
+++ b/status.php
@@ -33,8 +33,11 @@ try {
 		'version'=>implode('.', OC_Util::getVersion()),
 		'versionstring'=>OC_Util::getVersionString(),
 		'edition'=>OC_Util::getEditionString());
-
-	echo(json_encode($values));
+	if (OC::$CLI) {
+		print_r($values);
+	} else {
+		echo(json_encode($values));
+	}
 
 } catch (Exception $ex) {
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);