diff --git a/Makefile.am b/Makefile.am
index 40d72784d..0e3500450 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ CLEAN_LOCALS =
 CHECK_LOCALS =
 MANPAGES =
 MANLINKS =
+MANPAGES_EXTRA =
 
 EXTRA_DIST =
 CLEANFILES =
@@ -109,6 +110,7 @@ include misc-utils/Makemodule.am
 include disk-utils/Makemodule.am
 
 include bash-completion/Makemodule.am
+include man-common/Makemodule.am
 
 include tests/Makemodule.am
 
@@ -192,6 +194,7 @@ $(PATHFILES): Makefile
 		$(edit_cmd) $${srcdir}$@.in >$@.tmp
 	@ mv $@.tmp $@
 
+
 asciidoc_man_cmd = $(ASCIIDOCTOR) \
 	-b manpage \
 	-a 'VERSION=$(VERSION)' \
@@ -200,10 +203,9 @@ asciidoc_man_cmd = $(ASCIIDOCTOR) \
 dist_man_MANS += $(MANPAGES) $(MANLINKS)
 
 CLEANFILES += $(dist_man_MANS)
-EXTRA_DIST += $(MANPAGES:=.adoc)
+EXTRA_DIST += $(MANPAGES:=.adoc) $(MANPAGES_EXTRA)
 
-
-$(MANPAGES): Makefile
+$(MANPAGES): $(MANPAGES:=.adoc) $(MANPAGES_EXTRA) Makefile
 	@ rm -f $@
 	$(AM_V_at) $(MKDIR_P) $$(dirname $@)
 	$(AM_V_GEN) srcdir=''; \
diff --git a/man-common/Makemodule.am b/man-common/Makemodule.am
new file mode 100644
index 000000000..9ff08cb86
--- /dev/null
+++ b/man-common/Makemodule.am
@@ -0,0 +1,7 @@
+MANPAGES_EXTRA += \
+	      man-common/bugreports.adoc \
+	      man-common/footer.adoc \
+	      man-common/footer-config.adoc \
+	      man-common/footer-lib.adoc \
+	      man-common/manpage-stub.adoc \
+	      man-common/translation.adoc