diff --git a/README b/README
index 83116ded4..a83494944 100644
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ Running developer environment:
   in one terminal:
     ./manage.py runserver
   and in another one:
-    ./manage.py celeryd -Q default,encoding
+    ./manage.py celeryd -Q default,encoding -B
 
 Updating database:
  right now database updates are not managed, each time you update to current bzr
diff --git a/etc/init/pandora-encoding.conf b/etc/init/pandora-encoding.conf
index 9129a13c7..0d5685581 100644
--- a/etc/init/pandora-encoding.conf
+++ b/etc/init/pandora-encoding.conf
@@ -17,7 +17,7 @@ test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var
 test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
 cd $VENV/pandora
 exec /usr/bin/sudo -u $USER $VENV/bin/python $VENV/pandora/manage.py celeryd \
-                   -B \
+                   -B -s /var/run/pandora/celerybeat-schedule \
                    -Q encoding \
                    -n pandora-encoding \
                    -p /var/run/pandora/pandora-encoding.pid \
diff --git a/etc/init/pandora.conf b/etc/init/pandora.conf
index cf624360a..cfdbb8ba5 100644
--- a/etc/init/pandora.conf
+++ b/etc/init/pandora.conf
@@ -16,6 +16,7 @@ script
 test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var/log/pandora)
 test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
 cd $VENV/pandora
+./manage.py compile_pyc
 exec /usr/bin/sudo -u $USER $VENV/bin/gunicorn_django \
                    --bind      127.0.0.1:2620 \
                    --timeout   90 \
diff --git a/update.sh b/update.sh
index 4572addd9..45083d47a 100755
--- a/update.sh
+++ b/update.sh
@@ -5,4 +5,4 @@ cd static/oxjs
 bzr pull http://code.0x2620.org/oxjs/
 test -e src/python-ox && cd src/python-ox && bzr pull http://code.0x2620.org/python-ox/
 cd $base
-cd pandora && ./manage.py update_static
+cd pandora && ./manage.py update_static && ./manage.py compile_pyc