diff --git a/bin/phpcrsh b/bin/phpcrsh
index 1c540bc4..b87b268d 100755
--- a/bin/phpcrsh
+++ b/bin/phpcrsh
@@ -1,15 +1,16 @@
 #!/usr/bin/env php
 <?php
 
-$vendorDir = __DIR__.'/../vendor';
-
-$file = $vendorDir.'/autoload.php';
-
-if (file_exists($file)) {
-    $autoload = require_once $file;
-} else {
-    echo 'Cannot find the vendor directory, have you executed composer install?';
-    exit(1);
+if (!class_exists('\PHPCR\Shell\PhpcrShell')) {
+    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);
+    }
 }
 
 $shell = \PHPCR\Shell\PhpcrShell::createShell();
diff --git a/composer.json b/composer.json
index bb77db6e..5dccd528 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
     "autoload": {
         "psr-0": {"": "src"}
     },
+    "bin": ["bin/phpcrsh"],
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"