diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml
index b45dfae..0806bbc 100644
--- a/ansible/pre-deploy.yml
+++ b/ansible/pre-deploy.yml
@@ -50,3 +50,4 @@
           DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}"
           JEKYLL_HOST: "0.0.0.0"
           JEKYLL_PORT: "{{ http_port }}"
+          JEKYLL_BASEURL: "//{{ domain }}"
diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh
index 9a18a73..a1f41fe 100755
--- a/sbin/entrypoint.sh
+++ b/sbin/entrypoint.sh
@@ -7,8 +7,9 @@ run_jekyll() {
   set -eu
 
   bundle exec jekyll serve \
-    --port "$JEKYLL_PORT" \
+    --baseurl "$JEKYLL_BASEURL" \
     --host "$JEKYLL_HOST" \
+    --port "$JEKYLL_PORT" \
     --trace
 }