diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in
index aa63853f3..bd9e1b225 100644
--- a/doc/org/.dir-locals.el.in
+++ b/doc/org/.dir-locals.el.in
@@ -32,6 +32,9 @@
 		   :base-extension "org"
 		   :publishing-directory "../userdoc/"
 		   :recursive t
+		   :exclude "setup.org"
+		   :auto-sitemap t
+		   :sitemap-title "Sitemap for Spot"
 		   :publishing-function org-publish-org-to-html
 		   ; Org 8
 		   :html-head "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index 78ade61bb..4a275d11f 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -53,6 +53,9 @@
 	:base-extension "org"
 	:publishing-directory "@abs_top_srcdir@/doc/userdoc/"
 	:recursive t
+	:exclude "setup.org"
+	:auto-sitemap t
+	:sitemap-title "Sitemap for Spot"
 	:publishing-function
 	,(if (require 'org-publish nil t) 'org-publish-org-to-html ; Org 7
 	   'org-html-publish-to-html)                              ; Org 8