diff --git a/Makefile b/Makefile
index f0fedbb..5dd09c9 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ serve: build
 
 .PHONY: deploy-docs
 deploy-docs: docs
-	rsync -vlcr --delete-after ./build/* core.lxsameer.com:/home/www/public/fg42/
+	rsync -vlcr --delete-after ./build/site-build/* core.lxsameer.com:/home/www/public/fg42/
 
 .PHONY: dummy-x
 dummy-x:
diff --git a/core/fg42/build/docs.el b/core/fg42/build/docs.el
index 56036ad..5ce8100 100644
--- a/core/fg42/build/docs.el
+++ b/core/fg42/build/docs.el
@@ -311,9 +311,8 @@ Not pages."
     (message "Creating the main index file")
     (copy-template (from-root "/docs/site/templates/index.org")
                    (expand-file-name "site/index.org" build-dir)
-                   (list
-                    (cons :links
-                          (latest-org-list base-url))))
+                   `((:links . ,(latest-org-list base-url))
+                     (:base-url . ,base-url)))
 
     (message "Creating categories")
     (copy-template (from-root "/docs/site/templates/categories.org")
diff --git a/docs/site/templates/index.org b/docs/site/templates/index.org
index 92fdce9..b38d486 100644
--- a/docs/site/templates/index.org
+++ b/docs/site/templates/index.org
@@ -9,10 +9,10 @@
 #+INCLUDE: "../../README.org::*Future Gadgets 42" :only-contents t
 
 * Contribute
-FG42 made possible by the effort of the community of [[http:/pages/contributors.html][Contributors]].
+FG42 made possible by the effort of the community of [[<<<:base-url>>>/pages/contributors.html][Contributors]].
 
 If you're interested in *FG42* and wants to contribute to the project please follow
-the [[http:/pages/how-to-contribute.html][How to Contribute Guitd]]. Also please read our [[http:/pages/code-of-conduct.html][Code of Conduct]] as well.
+the [[<<<:base-url>>>/pages/how-to-contribute.html][How to Contribute Guitd]]. Also please read our [[<<<:base-url>>>/pages/code-of-conduct.html][Code of Conduct]] as well.
 
 * Recent updates:
 <<<:links>>>