diff --git a/bin/phpcr b/bin/phpcr
index d3a9bb1..766fd73 100755
--- a/bin/phpcr
+++ b/bin/phpcr
@@ -1,13 +1,16 @@
 #!/usr/bin/env php
 <?php
 
-$vendorDir = __DIR__.'/../vendor';
-
-$file = $vendorDir.'/autoload.php';
-if (file_exists($file)) {
-    $autoload = require_once $file;
-} else {
-    die("Install dependencies before using this command.\n");
+if (!class_exists('\Symfony\Component\Console\Application')) {
+    if (is_file(__DIR__.'/../vendor/autoload.php')) {
+        require __DIR__.'/../vendor/autoload.php';
+    } elseif (is_file(__DIR__.'/../../../autoload.php')) {
+        require __DIR__.'/../../../autoload.php';
+    } else {
+        echo 'Cannot find the vendor directory, have you executed composer install?'.PHP_EOL;
+        echo 'See https://getcomposer.org to get Composer.'.PHP_EOL;
+        exit(1);
+    }
 }
 
 $configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
diff --git a/composer.json b/composer.json
index 40a7de0..843a2ac 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
             "PHPCR\\Util": "src"
         }
     },
+    "bin": ["bin/phpcr"],
     "extra": {
         "branch-alias": {
             "dev-master": "1.2-dev"