diff --git a/console.php b/console.php
index 538837a04b..4aec5bdc24 100644
--- a/console.php
+++ b/console.php
@@ -20,9 +20,9 @@ if (!OC::$CLI) {
 	exit(0);
 }
 
-if ($argc < 1) {
+if ($argc <= 1) {
 	echo "Usage:" . PHP_EOL;
-	echo " php console.php <command>" . PHP_EOL;
+	echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
 	exit(0);
 }
 
diff --git a/occ b/occ
new file mode 100755
index 0000000000..e2b71fe4ab
--- /dev/null
+++ b/occ
@@ -0,0 +1,11 @@
+#!/usr/bin/php
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//$argv = $_SERVER['argv'];
+require_once __DIR__ . '/console.php';