diff --git a/robo b/robo
index 695a94b3f..6e12a74f6 100755
--- a/robo
+++ b/robo
@@ -16,4 +16,6 @@ if (strpos(basename(__FILE__), 'phar')) {
     }
 }
 $runner = new \Robo\Runner();
-$runner->execute();
+$exitCode = $runner->execute();
+exit($exitCode);
+
diff --git a/src/Runner.php b/src/Runner.php
index dec767769..08992bca3 100644
--- a/src/Runner.php
+++ b/src/Runner.php
@@ -87,7 +87,8 @@ public function execute($input = null)
             return;
         }
         $app->addCommandsFromClass($this->roboClass, $this->passThroughArgs);
-        $app->run($input);
+        $app->setAutoExit(false);
+        return $app->run($input);
     }
 
     /**