diff --git a/docs/Makefile b/docs/Makefile
index fc7ab62ad2..100df312e5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,5 +1,5 @@
-# Minimal makefile for Sphinx documentation
-#
+# Makefile to control Evennia documentation building. 
+# Most common commands are `make help`, `make quick` and `make local`.
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1195df76d3..1d25af7679 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,6 +2,7 @@
 
 sphinx==2.4.4
 sphinx-multiversion==0.1.1
+lunr==0.5.8
 
 # recommonmark custom branch with evennia-specific fixes
 git+https://github.com/evennia/recommonmark.git@evennia-mods#egg=recommonmark
diff --git a/docs/source/_templates/searchbox.html b/docs/source/_templates/searchbox.html
deleted file mode 100644
index 62fef56c69..0000000000
--- a/docs/source/_templates/searchbox.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<script type="text/javascript">
-var Search = {
-    store : null,
-    setIndex : function (data) {
-        this.store = data.store;
-    },
-};
-</script>
-{# The script searchindex.js contains the code Search.setIndex(...) where
-   the content is an object built from IndexBuilder.freeze(). So we need to
-   setup the Search.setIndex function beforehand just to store the data.
-   This should all be finished when onload fires, and at that point the code in
-   searchbox.js will pull the data out of Search.store and build the actual
-   index and callbacks.
- #}
-<script src="{{ pathto('searchindex.js', 1) }}" type="text/javascript"></script>
-
-<form class="search" action="" method="get" autocomplete="new-password">
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-  <input type="hidden" id="ls_lunrsearch-highlight" value="{{ lunrsearch_highlight }}" />
-  <input type="text" class="search-field" id="ls_search-field" name="q" placeholder="Search API" />
-  <ul class="results" id="ls_search-results"></ul>
-</form>