diff --git a/gerritbot.init b/gerritbot.init
index 788e54e..884c9a9 100755
--- a/gerritbot.init
+++ b/gerritbot.init
@@ -17,7 +17,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="GerritBot"
 NAME=gerritbot
-DAEMON=/usr/local/gerrit/$NAME
+DAEMON=/usr/local/bin/$NAME
 DAEMON_ARGS="/home/gerrit2/gerritbot.config"
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
diff --git a/setup.py b/setup.py
index a2db6b4..28ea4ff 100644
--- a/setup.py
+++ b/setup.py
@@ -52,5 +52,8 @@ setuptools.setup(
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Programming Language :: Python"
-    ]
+    ],
+    entry_points={
+        "console_scripts": ["gerritbot = gerritbot.bot:main"]
+    }
 )