diff --git a/bin/runner b/bin/foreman-runner
similarity index 90%
rename from bin/runner
rename to bin/foreman-runner
index ebd7a87..e8adb5c 100755
--- a/bin/runner
+++ b/bin/foreman-runner
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#/ Usage: runner [-d <dir>] <command>
+#/ Usage: foreman-runner [-d <dir>] <command>
 #/
 #/ Run a command with exec, optionally changing directory first
 
diff --git a/dist/deb.rake b/dist/deb.rake
index 15e53ff..ae6d23e 100644
--- a/dist/deb.rake
+++ b/dist/deb.rake
@@ -4,7 +4,7 @@ file pkg("/apt-#{version}/foreman-#{version}.deb") => distribution_files("deb")
       assemble_distribution
       assemble_gems
       assemble resource("deb/foreman"), "bin/foreman", 0755
-      File.chmod 0755, "bin/runner"
+      File.chmod 0755, "bin/foreman-runner"
     end
 
     assemble resource("deb/control"), "control"
diff --git a/lib/foreman.rb b/lib/foreman.rb
index f9d501f..339ece7 100644
--- a/lib/foreman.rb
+++ b/lib/foreman.rb
@@ -11,7 +11,7 @@ module Foreman
   end
 
   def self.runner
-    File.expand_path("../../bin/runner", __FILE__)
+    File.expand_path("../../bin/foreman-runner", __FILE__)
   end
 
   def self.jruby?