diff --git a/docs/books/src/sitemap.xml b/docs/books/src/sitemap.xml
index 0be3797e7..a220cd7f7 100644
--- a/docs/books/src/sitemap.xml
+++ b/docs/books/src/sitemap.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
-    <loc>https://mqlang.org</loc><priority>1.0</priority>  </url>
+    <loc>https://mqlang.org</loc>
+    <priority>1.0</priority>
+  </url>
   <url>
-    <loc>https://mqlang.org/playground</loc><priority>1.0</priority>
+    <loc>https://mqlang.org/playground</loc>
+    <priority>1.0</priority>
   </url>
   <url>
     <loc>https://mqlang.org/book</loc>
diff --git a/scripts/sitemap.mq b/scripts/sitemap.mq
index 627d1f33a..504b6fe18 100644
--- a/scripts/sitemap.mq
+++ b/scripts/sitemap.mq
@@ -1,20 +1,26 @@
 # Generate sitemap.xml from mdbook SUMMARY.md
-def sitemap_item(item, base_url):
-  let path = do to_text(item) | replace(".md", "") | replace("index", "");
-  | let loc = add(base_url, path)
+def sitemap_item(path, base_url):
+  let path = do path | replace(".md", "") | replace(".html", "") | replace("index", "") | rtrimstr("/");
+  | let sep = if (is_empty(path)): "" else: "/"
+  | let loc = base_url + sep + path
   | s"  <url>
     <loc>${loc}</loc>
     <priority>1.0</priority>
-  </url>";
+  </url>"
+end
 
 def sitemap(items, base_url):
   let headers = [
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
     "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">",
-    "  <url>\n    <loc>https://mqlang.org</loc><priority>1.0</priority>  </url>",
-    "  <url>\n    <loc>https://mqlang.org/playground</loc><priority>1.0</priority>\n  </url>",
+    "  <url>\n    <loc>https://mqlang.org</loc>\n    <priority>1.0</priority>\n  </url>",
+    "  <url>\n    <loc>https://mqlang.org/playground</loc>\n    <priority>1.0</priority>\n  </url>",
   ]
   | let footer = "</urlset>"
-  | [headers, map(items, fn(item): sitemap_item(item, base_url);), footer]
+  | [headers,
+    do map(items, fn(item): to_text(item);) | filter(fn(item): !is_empty(item);) | uniq() | map(fn(path): sitemap_item(path, base_url););,
+    footer]
   | flatten()
-  | join("\n");
+  | join("\n")
+end
+
diff --git a/scripts/update_doc.sh b/scripts/update_doc.sh
index 888fbde7f..df5c3eedf 100755
--- a/scripts/update_doc.sh
+++ b/scripts/update_doc.sh
@@ -9,5 +9,5 @@ mq -U -o README.md --args mq_run_help "$CLI_HELP" 'select(.code.lang == "sh") |
 mq docs -- -F html -M json -M csv -M section -M toml -M yaml -M xml -M fuzzy -M table -B  > docs/books/src/builtins.html
 
 # Generate the sitemap
-cd scripts && mq 'include "sitemap" | .[] | nodes | sitemap("https://mqlang.org/book/")' ../docs/books/src/SUMMARY.md > ../docs/books/src/sitemap.xml
+cd scripts && mq 'include "sitemap" | .[] | nodes | sitemap("https://mqlang.org/book")' ../docs/books/src/SUMMARY.md > ../docs/books/src/sitemap.xml