diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile
deleted file mode 100644
index 43c5a378..00000000
--- a/doc/manuals/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ..
-
-ASCIIDOC = osmo-gsm-tester-manual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
-include $(TOPDIR)/build/Makefile.asciidoc.inc
-
-include $(TOPDIR)/build/Makefile.common.inc
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
new file mode 100644
index 00000000..4301ab9c
--- /dev/null
+++ b/doc/manuals/Makefile.am
@@ -0,0 +1,10 @@
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
+EXTRA_DIST = osmo-gsm-tester-manual.adoc \
+	osmo-gsm-tester-manual-docinfo.xml \
+	chapters
+
+ASCIIDOC = osmo-gsm-tester-manual.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
+
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/doc/manuals/osmo-gsm-tester-manual.adoc b/doc/manuals/osmo-gsm-tester-manual.adoc
index b7283847..6f0edf72 100644
--- a/doc/manuals/osmo-gsm-tester-manual.adoc
+++ b/doc/manuals/osmo-gsm-tester-manual.adoc
@@ -7,14 +7,14 @@ Neels Hofmeyr <nhofmeyr@sysmocom.de>
 *NOTE: The osmo-gsm-tester is still in pre-alpha stage: some parts are still
 incomplete, and details will still change and move around.*
 
-include::chapters/intro.adoc[]
+include::{srcdir}/chapters/intro.adoc[]
 
-include::chapters/install.adoc[]
+include::{srcdir}/chapters/install.adoc[]
 
-include::chapters/config.adoc[]
+include::{srcdir}/chapters/config.adoc[]
 
-include::chapters/trial.adoc[]
+include::{srcdir}/chapters/trial.adoc[]
 
-include::chapters/test_api.adoc[]
+include::{srcdir}/chapters/test_api.adoc[]
 
-include::chapters/debugging.adoc[]
+include::{srcdir}/chapters/debugging.adoc[]