diff --git a/Cargo.toml b/Cargo.toml
index 04704cdc2..9dadaab42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -95,6 +95,8 @@ default-members = [
     "components/push",
     "components/remote_settings",
     "components/search",
+    "components/relevancy",
+    "components/suggest",
     "components/support/error",
     "components/support/error/macros",
     "components/support/error/tests",
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 21889bfcd..6ad8b1940 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -50,7 +50,9 @@
   - [places](rust-docs/places/index.html)
   - [push](rust-docs/push/index.html)
   - [remote_settings](rust-docs/remote_settings/index.html)
+  - [relevancy](rust-docs/relevancy/index.html)
   - [search](rust-docs/search/index.html)
+  - [suggest](rust-docs/suggest/index.html)
   - [sync15](rust-docs/sync15/index.html)
   - [tabs](rust-docs/tabs/index.html)
   - [viaduct](rust-docs/viaduct/index.html)
diff --git a/docs/topic-guides/suggest.md b/docs/topic-guides/suggest.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/build-book.sh b/tools/build-book.sh
index aacb3b3a4..b0a43790c 100755
--- a/tools/build-book.sh
+++ b/tools/build-book.sh
@@ -9,6 +9,11 @@
 
 set -xe
 
+if [[ ! -f "$(pwd)/tools/build-book.sh" ]]; then
+  echo "ERROR: build-book.sh should be run from the root directory of the repo"
+  exit 1
+fi
+
 # Generate the Rust docs and move them over to the book.
 # We document all features. Ideally we'd leverage https://docs.rs/document-features/latest/document_features/
 # so the features themselves are documented, but that's another dependency or another yak, so for another day.