diff --git a/.gitignore b/.gitignore
index 3535fdedf51..8fe66b93a4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ local.properties
 # Kotlin
 .kotlin/
 
+# mdBook
+book/
+
 # Generated folders
 bin/
 build/
diff --git a/docs/book.toml b/docs/book.toml
index 4089ac28682..796c4648ac4 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -10,11 +10,12 @@ src = "."
 edition = "2018"
 
 [build]
-build-dir = "book"
+build-dir = "book/docs/latest"
 create-missing = false
 
 [output.html]
 git-repository-url = "https://github.com/thunderbird/thunderbird-android"
+edit-url-template = "https://github.com/thunderbird/thunderbird-android/edit/main/{path}"
 git-branch = "main"
 fold.enable = true
 theme = "assets/theme"
@@ -31,3 +32,5 @@ renderer = ["html"]
 
 [preprocessor.mermaid]
 command = "mdbook-mermaid"
+
+[preprocessor.pagetoc]