diff --git a/init.d/celeryd-upstart.conf b/init.d/celeryd-upstart.conf
new file mode 100644
--- /dev/null
+++ b/init.d/celeryd-upstart.conf
@@ -0,0 +1,34 @@
+# celeryd - run the celeryd daemon as an upstart job for rhodecode
+# Change variables/paths as necessary and place file /etc/init/celeryd.conf
+# start/stop/restart as normal upstart job (ie: $ start celeryd)
+
+description	"Celery for RhodeCode Mercurial Server"
+author		"Matt Zuba <matt.zuba@goodwillaz.org"
+
+start on starting rhodecode
+stop on stopped rhodecode
+
+respawn
+
+umask 0022
+
+env PIDFILE=/tmp/celeryd.pid
+env APPINI=/var/hg/rhodecode/production.ini
+env HOME=/var/hg
+env USER=hg
+# To use group (if different from user), you must edit sudoers file and change
+# root's entry from (ALL) to (ALL:ALL)
+# env GROUP=hg
+
+script
+    COMMAND="/var/hg/.virtualenvs/rhodecode/bin/paster celeryd $APPINI --pidfile=$PIDFILE"
+    if [ -z "$GROUP" ]; then
+        exec sudo -u $USER $COMMAND
+    else
+        exec sudo -u $USER -g $GROUP $COMMAND
+    fi
+end script
+
+post-stop script
+    rm -f $PIDFILE
+end script
diff --git a/init.d/rhodecode-upstart.conf b/init.d/rhodecode-upstart.conf
--- a/init.d/rhodecode-upstart.conf
+++ b/init.d/rhodecode-upstart.conf
@@ -22,5 +22,5 @@ env GROUP=hg
 exec /var/hg/.virtualenvs/rhodecode/bin/paster serve --user=$USER --group=$GROUP --pid-file=$PIDFILE --log-file=$LOGFILE $APPINI
 
 post-stop script
-	rm $PIDFILE
+	rm -f $PIDFILE
 end script