diff --git a/docs/Makefile b/docs/Makefile
index 3c29e6a38..4cac1dc8a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -16,7 +16,7 @@ build: .ruby-bundle
 
 build-tmp: .ruby-bundle
 	rm -rf _site-tmp
-	bundle exec jekyll build --disable-disk-cache -b /tmp/inter-v4-website/ -d _site-tmp
+	bundle exec jekyll build --disable-disk-cache -b /tmp/inter-v4-website -d _site-tmp
 
 serve: .ruby-bundle
 	$(Q)if [ ! -s lab/fonts ]; then \
@@ -30,7 +30,7 @@ serve: .ruby-bundle
 	@# copied font files and re-creating the symlink, but it was a frail process.
 	@# For live testing with fonts, you'll instead want to use docs/lab/serve.py
 	$(Q)rm -rf _site
-	$(Q)bundle exec jekyll serve -b / --watch \
+	$(Q)bundle exec jekyll serve -b '' --watch \
 		--config _config.yml,_config-dev.yml \
 	  --host $(HTTP_SERVER_BIND_ADDR) --port 3002 \
 	  --livereload --livereload-port 30002
diff --git a/docs/index.html b/docs/index.html
index c8a82af2a..37b271671 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-{%
+{% include defs.html %}{%
 
 assign release_version = site.data.fontinfo[0].version %}{%
 
@@ -22,8 +22,6 @@ for c in site.data.languages %}{%
     assign lang_count = lang_count | plus:1 %}{%
   endfor %}{%
 endfor -%}
-<!-- url_root={{url_root}} -->
-<!-- site.baseurl={{site.baseurl}} -->
 <style type="text/css">
 
 body { overflow-x: hidden }