diff --git a/scanFiles.php b/apps/files/console/scan.php
similarity index 95%
rename from scanFiles.php
rename to apps/files/console/scan.php
index 2144fce5d5a..118e586aea3 100644
--- a/scanFiles.php
+++ b/apps/files/console/scan.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/lib/base.php';
-
 if (!OC::$CLI) {
 	echo "This script can be run from the command line only\n";
 	return;
diff --git a/console.php b/console.php
new file mode 100644
index 00000000000..a3b1357a287
--- /dev/null
+++ b/console.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$RUNTIME_NOAPPS = true;
+require_once 'lib/base.php';
+
+// Don't do anything if ownCloud has not been installed yet
+if (!OC_Config::getValue('installed', false)) {
+	exit(0);
+}
+
+if (OC::$CLI) {
+	if ($argc > 1 && $argv[1] === 'files:scan') {
+		require_once 'apps/files/console/scan.php';
+	}
+}
+else
+{
+	echo "This script can be run from the command line only\n";
+}