diff --git a/bootstrap.conf b/bootstrap.conf
index 73c64412..bf44f802 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -36,6 +36,7 @@ maintainer_modules='
 gitlog-to-changelog
 maintainer-makefile
 update-copyright
+gendocs
 '
 
 # 'consider' comments copied from 'import-gnulib.config':
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index d403b486..6bb00da2 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -23,3 +23,4 @@
 /vc-list-files
 /warn-on-use.h
 /ylwrap
+/gendocs.sh
diff --git a/cfg.mk b/cfg.mk
index 2e3faa83..fabd4dd8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+manual_title = Finding Files
+# We need to pass the -I option to gendocs so that the texinfo tools
+# can find dblocation.texi, which is a generated file.
+gendocs_options_ = -s find.texi -I $(abs_builddir)/doc
+
 local-checks-to-skip :=
 
 # Errors I think are too picky anyway.
diff --git a/doc/.gitignore b/doc/.gitignore
index 8a256bc1..a951f73e 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -29,3 +29,5 @@
 /regexprops-generic.texi
 /parse-datetime.texi
 /dblocation.texi
+/gendocs_template
+/gendocs_template_min