diff --git a/daemons/controld/Makefile.am b/daemons/controld/Makefile.am
index 7fef7f3f07..db45bcba4a 100644
--- a/daemons/controld/Makefile.am
+++ b/daemons/controld/Makefile.am
@@ -1,83 +1,84 @@
 #
-# Copyright 2018-2019 the Pacemaker project contributors
+# Copyright 2018-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 halib_PROGRAMS	= pacemaker-controld
 
 noinst_HEADERS	= controld_alerts.h		\
 		  controld_callbacks.h		\
 		  controld_fencing.h		\
 		  controld_fsa.h		\
 		  controld_lrm.h		\
 		  controld_matrix.h		\
 		  controld_membership.h		\
 		  controld_messages.h		\
 		  controld_metadata.h		\
 		  controld_throttle.h		\
 		  controld_timers.h		\
 		  controld_transition.h		\
 		  controld_utils.h		\
 		  pacemaker-controld.h
 
 pacemaker_controld_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pacemaker_controld_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_controld_LDADD = $(top_builddir)/lib/fencing/libstonithd.la		\
 			   $(top_builddir)/lib/pacemaker/libpacemaker.la \
 			   $(top_builddir)/lib/pengine/libpe_rules.la		\
 			   $(top_builddir)/lib/cib/libcib.la			\
 			   $(top_builddir)/lib/cluster/libcrmcluster.la		\
 			   $(top_builddir)/lib/common/libcrmcommon.la		\
 			   $(top_builddir)/lib/services/libcrmservice.la	\
 			   $(top_builddir)/lib/lrmd/liblrmd.la			\
 			   $(CLUSTERLIBS)
 
 pacemaker_controld_SOURCES = pacemaker-controld.c	\
 			     controld_attrd.c		\
 			     controld_callbacks.c	\
 			     controld_based.c		\
 			     controld_control.c		\
 			     controld_corosync.c	\
 			     controld_election.c	\
 			     controld_execd.c		\
 			     controld_execd_state.c	\
 			     controld_fencing.c		\
 			     controld_fsa.c		\
 			     controld_join_client.c	\
 			     controld_join_dc.c		\
 			     controld_membership.c	\
 			     controld_messages.c	\
 			     controld_metadata.c	\
 			     controld_remote_ra.c	\
 			     controld_schedulerd.c	\
 			     controld_te_actions.c	\
 			     controld_te_callbacks.c	\
 			     controld_te_events.c	\
 			     controld_te_utils.c	\
 			     controld_throttle.c	\
 			     controld_timers.c		\
 			     controld_transition.c	\
 			     controld_utils.c
 
 if BUILD_XML_HELP
 man7_MANS 	= pacemaker-controld.7
 endif
 
 CLEANFILES = $(man7_MANS)
 
 if BUILD_LEGACY_LINKS
 install-exec-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f crmd && $(LN_S) pacemaker-controld crmd
 
 uninstall-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f crmd
 endif
diff --git a/daemons/execd/Makefile.am b/daemons/execd/Makefile.am
index 17414689b0..80cbcb5e0f 100644
--- a/daemons/execd/Makefile.am
+++ b/daemons/execd/Makefile.am
@@ -1,73 +1,74 @@
 #
 # Copyright 2012-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU Lesser General Public License
 # version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 halibdir		= $(CRM_DAEMON_DIR)
 
 halib_PROGRAMS		= pacemaker-execd cts-exec-helper
 
 pacemaker_execd_CFLAGS		= $(CFLAGS_HARDENED_EXE)
 pacemaker_execd_LDFLAGS		= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_execd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la \
 				  $(top_builddir)/lib/services/libcrmservice.la	\
 				  $(top_builddir)/lib/fencing/libstonithd.la
 pacemaker_execd_SOURCES		= pacemaker-execd.c execd_commands.c \
 				  execd_alerts.c
 
 if BUILD_REMOTE
 initdir			= $(INITDIR)
 init_SCRIPTS		= pacemaker_remote
 sbin_PROGRAMS		= pacemaker-remoted
 if BUILD_SYSTEMD
 systemdsystemunit_DATA	= pacemaker_remote.service
 endif
 
 
 pacemaker_remoted_CPPFLAGS	= -DPCMK__COMPILE_REMOTE $(AM_CPPFLAGS)
 
 pacemaker_remoted_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pacemaker_remoted_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_remoted_LDADD		= $(pacemaker_execd_LDADD) \
 				  $(top_builddir)/lib/lrmd/liblrmd.la
 pacemaker_remoted_SOURCES	= $(pacemaker_execd_SOURCES) \
 				  remoted_tls.c remoted_pidone.c remoted_proxy.c
 endif
 
 cts_exec_helper_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la    \
 			  $(top_builddir)/lib/lrmd/liblrmd.la		\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/services/libcrmservice.la \
 			  $(top_builddir)/lib/pengine/libpe_status.la
 cts_exec_helper_SOURCES	= cts-exec-helper.c
 
 noinst_HEADERS  = pacemaker-execd.h
 
 CLEANFILES = $(man8_MANS)
 
 # Always create a symlink for the old pacemaker_remoted name, so that bundle
 # container images using a current Pacemaker will run on cluster nodes running
 # Pacemaker 1 (>=1.1.17).
 install-exec-hook:
 if BUILD_LEGACY_LINKS
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f lrmd && $(LN_S) pacemaker-execd lrmd
 endif
 if BUILD_REMOTE
 	cd $(DESTDIR)$(sbindir) && rm -f pacemaker_remoted && $(LN_S) pacemaker-remoted pacemaker_remoted
 endif
 
 uninstall-hook:
 if BUILD_LEGACY_LINKS
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f lrmd
 endif
 if BUILD_REMOTE
 	cd $(DESTDIR)$(sbindir) && rm -f pacemaker_remoted
 endif
diff --git a/daemons/fenced/Makefile.am b/daemons/fenced/Makefile.am
index 2923d7c9bd..9485ca5d17 100644
--- a/daemons/fenced/Makefile.am
+++ b/daemons/fenced/Makefile.am
@@ -1,55 +1,56 @@
 #
 # Original Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright 2004 International Business Machines
 #
-# with later changes copyright 2004-2019 the Pacemaker project contributors.
+# with later changes copyright 2004-2021 the Pacemaker project contributors.
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 halib_PROGRAMS	= pacemaker-fenced cts-fence-helper
 
 sbin_SCRIPTS	= fence_legacy fence_watchdog
 
 noinst_HEADERS	= pacemaker-fenced.h
 
 if BUILD_XML_HELP
 man7_MANS	= pacemaker-fenced.7
 endif
 
 EXTRA_DIST	= README.md
 
 cts_fence_helper_SOURCES	= cts-fence-helper.c
 cts_fence_helper_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 				  $(top_builddir)/lib/fencing/libstonithd.la
 
 pacemaker_fenced_YFLAGS		= -d
 pacemaker_fenced_CFLAGS		= $(CFLAGS_HARDENED_EXE)
 pacemaker_fenced_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 pacemaker_fenced_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la		\
 				  $(top_builddir)/lib/cib/libcib.la		\
 				  $(top_builddir)/lib/cluster/libcrmcluster.la		\
 				  $(top_builddir)/lib/fencing/libstonithd.la		\
 				  $(top_builddir)/lib/pengine/libpe_status.la		\
 				  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 				  $(CLUSTERLIBS)
 pacemaker_fenced_SOURCES	= pacemaker-fenced.c \
 				  fenced_commands.c \
 				  fenced_remote.c \
 				  fenced_history.c
 
 CLEANFILES = $(man7_MANS) $(man8_MANS)
 
 if BUILD_LEGACY_LINKS
 install-exec-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f stonithd && $(LN_S) pacemaker-fenced stonithd
 
 uninstall-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f stonithd
 endif
diff --git a/daemons/pacemakerd/Makefile.am b/daemons/pacemakerd/Makefile.am
index 84517a38cd..fc0e01404d 100644
--- a/daemons/pacemakerd/Makefile.am
+++ b/daemons/pacemakerd/Makefile.am
@@ -1,36 +1,37 @@
 #
 # Copyright 2004-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 sbin_PROGRAMS		= pacemakerd
 
 if BUILD_SYSTEMD
 systemdsystemunit_DATA	= pacemaker.service
 endif
 
 EXTRA_DIST 	= pacemakerd.8.inc
 
 ## SOURCES
 
 noinst_HEADERS		= pacemakerd.h
 
 pacemakerd_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pacemakerd_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemakerd_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la
 pacemakerd_LDADD	+= $(CLUSTERLIBS)
 pacemakerd_SOURCES	= pacemakerd.c
 if BUILD_CS_SUPPORT
 pacemakerd_SOURCES	+= pcmkd_corosync.c
 endif
 pacemakerd_SOURCES	+= pcmkd_messages.c
 pacemakerd_SOURCES	+= pcmkd_subdaemons.c
 
 CLEANFILES = $(man8_MANS)
diff --git a/daemons/schedulerd/Makefile.am b/daemons/schedulerd/Makefile.am
index c5e97aa6a7..87c84aa809 100644
--- a/daemons/schedulerd/Makefile.am
+++ b/daemons/schedulerd/Makefile.am
@@ -1,49 +1,50 @@
 #
-# Copyright 2004-2019 the Pacemaker project contributors
+# Copyright 2004-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 AM_CPPFLAGS	+= -I$(top_builddir) -I$(top_srcdir)
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 ## binary progs
 
 halib_PROGRAMS	= pacemaker-schedulerd
 
 if BUILD_XML_HELP
 man7_MANS =	pacemaker-schedulerd.7
 endif
 
 ## SOURCES
 
 pacemaker_schedulerd_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pacemaker_schedulerd_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 pacemaker_schedulerd_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la \
 							  $(top_builddir)/lib/pengine/libpe_status.la \
 							  $(top_builddir)/lib/pacemaker/libpacemaker.la
 # libcib for get_object_root()
 pacemaker_schedulerd_SOURCES	= pacemaker-schedulerd.c
 
 install-exec-local:
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(PE_STATE_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
 
 if BUILD_LEGACY_LINKS
 install-exec-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f pengine && $(LN_S) pacemaker-schedulerd pengine
 
 uninstall-hook:
 	cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f pengine
 endif
 
 uninstall-local:
 	-rmdir $(DESTDIR)/$(PE_STATE_DIR)
 
 CLEANFILES = $(man7_MANS)
diff --git a/extra/resources/Makefile.am b/extra/resources/Makefile.am
index dd3183317e..fa74b31801 100644
--- a/extra/resources/Makefile.am
+++ b/extra/resources/Makefile.am
@@ -1,39 +1,40 @@
 #
-# Copyright 2008-2019 the Pacemaker project contributors
+# Copyright 2008-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 ocfdir			= @OCF_RA_INSTALL_DIR@/pacemaker
 dist_ocf_SCRIPTS	= attribute	\
 			  controld	\
 			  Dummy		\
 			  HealthCPU	\
 			  HealthIOWait	\
 			  ping		\
 			  remote	\
 			  Stateful	\
 			  SystemHealth
 ocf_SCRIPTS		= ClusterMon	\
 			  HealthSMART	\
 			  ifspeed	\
 			  o2cb		\
 			  SysInfo
 
 if BUILD_XML_HELP
 
 man7_MANS = $(ocf_SCRIPTS:%=ocf_pacemaker_%.7) $(dist_ocf_SCRIPTS:%=ocf_pacemaker_%.7)
 DBOOK_OPTS = --stringparam command.prefix ocf_pacemaker_ --stringparam variable.prefix OCF_RESKEY_ --param man.vol 7
 
 ocf_pacemaker_%.xml:  %
 	$(AM_V_GEN)OCF_FUNCTIONS=/dev/null OCF_ROOT=$(OCF_ROOT_DIR) $(abs_builddir)/$< meta-data > $@
 
 endif
 
 clean-generic:
 	rm -f $(man7_MANS) $(ocf_SCRIPTS:%=%.xml) $(dist_ocf_SCRIPTS:%=%.xml) *~
diff --git a/mk/common.mk b/mk/common.mk
index c3d1993123..ac360cc5ea 100644
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -1,106 +1,40 @@
 #
 # Copyright 2014-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 #
 # Some variables to help with silent rules
 # https://www.gnu.org/software/automake/manual/html_node/Automake-silent_002drules-Option.html
 
 V ?= $(AM_DEFAULT_VERBOSITY)
 
 # When a make command is prefixed with one of the AM_V_* macros, it may also be
 # desirable to suffix the command with this, to silence stdout.
 PCMK_quiet = $(pcmk_quiet_$(V))
 pcmk_quiet_0 = >/dev/null
 pcmk_quiet_1 = 
 
 # AM_V_GEN is intended to be used in custom pattern rules, and replaces echoing
 # the command used with a more concise line with "GEN" and the name of the file
 # being generated. Our AM_V_* macros are similar but more descriptive.
 AM_V_MAN = $(am__v_MAN_$(V))
 am__v_MAN_0 = @echo "  MAN      $@";
 am__v_MAN_1 = 
 
 AM_V_SCHEMA = $(am__v_SCHEMA_$(V))
 am__v_SCHEMA_0 = @echo "  SCHEMA   $@";
 am__v_SCHEMA_1 = 
 
 AM_V_BOOK = $(am__v_BOOK_$(V))
 am__v_BOOK_0 = @echo "  BOOK    $(@:%/_build=%): $(BOOK_FORMATS)";
 am__v_BOOK_1 = 
 
 MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include   \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
-
-#
-# Man page builders
-#
-# We have three types of man pages:
-# - man pages for the tools
-# - man pages for OCF agents
-# - man pages for cluster properties used by daemons
-#
-# "BUILD_HELP" actually means "help2man is available", so it only controls the
-# tool man pages, which are generated by help2man. The other man pages are
-# generated via XSL transforms.
-#
-
-if BUILD_HELP
-man8_MANS		= $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
-
-HELP2MAN_ARGS = -N --section 8 --name "Part of the Pacemaker cluster resource manager"
-
-# Some of our tools' help are just shell script invocations of another tool's
-# help. Putting the real tool in MAN8DEPS helps detect when the wrapped help
-# needs updating.
-#
-# If a ".inc" file exists, the tool has been converted to use glib for
-# argument parsing, otherwise it still uses the libcrmcommon functions.
-#
-# @TODO Drop MAN8DEPS once we've converted all tools to libpacemaker API calls
-#       and all wrappers to C code.
-%.8:	% $(MAN8DEPS)
-	$(AM_V_at)chmod a+x $(abs_builddir)/$<
-	PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --version >/dev/null
-	if [ -f $(abs_srcdir)/$@.inc ]; then \
-		PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help-all >/dev/null; \
-	else \
-		PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help >/dev/null; \
-	fi
-	$(AM_V_MAN)if [ -f $(abs_srcdir)/$@.inc ]; then			\
-		PATH=$(abs_builddir):$$PATH $(HELP2MAN) $(HELP2MAN_ARGS)	\
-			-h --help-all 						\
-			--no-discard-stderr 					\
-			-i $(abs_srcdir)/$@.inc $(abs_builddir)/$<		\
-			| sed -f $(top_srcdir)/tools/fix-manpages > $@ ; \
-	else									\
-		PATH=$(abs_builddir):$$PATH $(HELP2MAN) $(HELP2MAN_ARGS)	\
-			--no-discard-stderr 					\
-			$(abs_builddir)/$< --output $@ ;			\
-	fi
-endif
-
-# Save raw XML meta-data from daemon executables, for later conversion into man
-# pages. (Note that more specific rules may override this for creating other
-# types of XML files.)
-%.xml:  %
-	$(AM_V_at)$(abs_builddir)/$< metadata > $@
-
-# Process the raw daemon and OCF agent meta-data output using our
-# meta-data-to-docbook-XML tranform.
-%.dbook: %.xml
-	$(AM_V_at)$(XSLTPROC) --nonet --novalid --stringparam man.name $* \
-		$(DBOOK_OPTS) $(top_srcdir)/xml/ocf-meta2man.xsl \
-		$(abs_builddir)/$< > $(abs_builddir)/$@
-
-# Generate the actual man page for an OCF resource agent from the intermediate
-# docbook XML.
-%.7:	%.dbook
-	$(AM_V_MAN)$(XSLTPROC) $(MANPAGE_XSLT) $(abs_builddir)/$< $(PCMK_quiet)
diff --git a/mk/common.mk b/mk/man.mk
similarity index 71%
copy from mk/common.mk
copy to mk/man.mk
index c3d1993123..5e603a59b4 100644
--- a/mk/common.mk
+++ b/mk/man.mk
@@ -1,106 +1,74 @@
 #
 # Copyright 2014-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
-#
-# Some variables to help with silent rules
-# https://www.gnu.org/software/automake/manual/html_node/Automake-silent_002drules-Option.html
-
-V ?= $(AM_DEFAULT_VERBOSITY)
-
-# When a make command is prefixed with one of the AM_V_* macros, it may also be
-# desirable to suffix the command with this, to silence stdout.
-PCMK_quiet = $(pcmk_quiet_$(V))
-pcmk_quiet_0 = >/dev/null
-pcmk_quiet_1 = 
-
-# AM_V_GEN is intended to be used in custom pattern rules, and replaces echoing
-# the command used with a more concise line with "GEN" and the name of the file
-# being generated. Our AM_V_* macros are similar but more descriptive.
-AM_V_MAN = $(am__v_MAN_$(V))
-am__v_MAN_0 = @echo "  MAN      $@";
-am__v_MAN_1 = 
-
-AM_V_SCHEMA = $(am__v_SCHEMA_$(V))
-am__v_SCHEMA_0 = @echo "  SCHEMA   $@";
-am__v_SCHEMA_1 = 
-
-AM_V_BOOK = $(am__v_BOOK_$(V))
-am__v_BOOK_0 = @echo "  BOOK    $(@:%/_build=%): $(BOOK_FORMATS)";
-am__v_BOOK_1 = 
-
-MAINTAINERCLEANFILES	= Makefile.in
-
-AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include   \
-			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
-
 #
 # Man page builders
 #
 # We have three types of man pages:
 # - man pages for the tools
 # - man pages for OCF agents
 # - man pages for cluster properties used by daemons
 #
 # "BUILD_HELP" actually means "help2man is available", so it only controls the
 # tool man pages, which are generated by help2man. The other man pages are
 # generated via XSL transforms.
 #
 
 if BUILD_HELP
 man8_MANS		= $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
 
 HELP2MAN_ARGS = -N --section 8 --name "Part of the Pacemaker cluster resource manager"
 
 # Some of our tools' help are just shell script invocations of another tool's
 # help. Putting the real tool in MAN8DEPS helps detect when the wrapped help
 # needs updating.
 #
 # If a ".inc" file exists, the tool has been converted to use glib for
 # argument parsing, otherwise it still uses the libcrmcommon functions.
 #
 # @TODO Drop MAN8DEPS once we've converted all tools to libpacemaker API calls
 #       and all wrappers to C code.
 %.8:	% $(MAN8DEPS)
 	$(AM_V_at)chmod a+x $(abs_builddir)/$<
 	PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --version >/dev/null
 	if [ -f $(abs_srcdir)/$@.inc ]; then \
 		PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help-all >/dev/null; \
 	else \
 		PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help >/dev/null; \
 	fi
 	$(AM_V_MAN)if [ -f $(abs_srcdir)/$@.inc ]; then			\
 		PATH=$(abs_builddir):$$PATH $(HELP2MAN) $(HELP2MAN_ARGS)	\
 			-h --help-all 						\
 			--no-discard-stderr 					\
 			-i $(abs_srcdir)/$@.inc $(abs_builddir)/$<		\
 			| sed -f $(top_srcdir)/tools/fix-manpages > $@ ; \
 	else									\
 		PATH=$(abs_builddir):$$PATH $(HELP2MAN) $(HELP2MAN_ARGS)	\
 			--no-discard-stderr 					\
 			$(abs_builddir)/$< --output $@ ;			\
 	fi
 endif
 
 # Save raw XML meta-data from daemon executables, for later conversion into man
 # pages. (Note that more specific rules may override this for creating other
 # types of XML files.)
 %.xml:  %
 	$(AM_V_at)$(abs_builddir)/$< metadata > $@
 
 # Process the raw daemon and OCF agent meta-data output using our
 # meta-data-to-docbook-XML tranform.
 %.dbook: %.xml
 	$(AM_V_at)$(XSLTPROC) --nonet --novalid --stringparam man.name $* \
 		$(DBOOK_OPTS) $(top_srcdir)/xml/ocf-meta2man.xsl \
 		$(abs_builddir)/$< > $(abs_builddir)/$@
 
 # Generate the actual man page for an OCF resource agent from the intermediate
 # docbook XML.
 %.7:	%.dbook
 	$(AM_V_MAN)$(XSLTPROC) $(MANPAGE_XSLT) $(abs_builddir)/$< $(PCMK_quiet)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0a1489f1d5..e4385da6e0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,171 +1,172 @@
 #
 # Copyright 2004-2021 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 include $(top_srcdir)/mk/common.mk
+include $(top_srcdir)/mk/man.mk
 
 if BUILD_SYSTEMD
 systemdsystemunit_DATA	= crm_mon.service
 endif
 
 noinst_HEADERS		= crm_mon.h crm_resource.h
 
 pcmkdir			= $(datadir)/$(PACKAGE)
 pcmk_DATA		= report.common report.collector
 
 sbin_SCRIPTS		= crm_report crm_standby crm_master crm_failcount
 if BUILD_CIBSECRETS
 sbin_SCRIPTS		+= cibsecret
 endif
 noinst_SCRIPTS		= pcmk_simtimes
 
 EXTRA_DIST		= crm_attribute.8.inc \
 				  crm_diff.8.inc \
 				  crm_error.8.inc \
 			  crm_mon.8.inc			\
 			  crm_node.8.inc \
 			  crm_resource.8.inc \
 			  crm_rule.8.inc \
 			  crm_simulate.8.inc \
 			  crm_verify.8.inc \
 			  crmadmin.8.inc \
 			  fix-manpages \
 			  stonith_admin.8.inc
 
 sbin_PROGRAMS		= attrd_updater \
 			  cibadmin \
 			  crmadmin \
 			  crm_simulate \
 			  crm_attribute \
 			  crm_diff \
 			  crm_error \
 			  crm_mon \
 			  crm_node \
 			  crm_resource \
 			  crm_rule \
 			  crm_shadow \
 			  crm_verify \
 			  crm_ticket \
 			  iso8601 \
 			  stonith_admin
 
 if BUILD_SERVICELOG
 sbin_PROGRAMS		+= notifyServicelogEvent
 endif
 if BUILD_OPENIPMI_SERVICELOG
 sbin_PROGRAMS		+= ipmiservicelogd
 endif
 
 ## SOURCES
 
 # A few tools are just thin wrappers around crm_attribute.
 # This makes their help get updated when crm_attribute changes
 # (see mk/common.mk).
 MAN8DEPS		= crm_attribute
 
 crmadmin_SOURCES	= crmadmin.c
 crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la
 
 crm_error_SOURCES	= crm_error.c
 crm_error_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la
 
 cibadmin_SOURCES	= cibadmin.c
 cibadmin_LDADD		= $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_shadow_SOURCES	= crm_shadow.c
 crm_shadow_LDADD	= $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_node_SOURCES	= crm_node.c
 crm_node_LDADD		= $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_simulate_SOURCES	= crm_simulate.c
 
 crm_simulate_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_diff_SOURCES	= crm_diff.c
 crm_diff_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_mon_SOURCES		= crm_mon.c crm_mon_curses.c
 crm_mon_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/lib/fencing/libstonithd.la	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la	\
 			  $(CURSESLIBS)
 
 crm_verify_SOURCES	= crm_verify.c
 crm_verify_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la 	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_attribute_SOURCES	= crm_attribute.c
 crm_attribute_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_resource_SOURCES	= crm_resource.c		\
 			  crm_resource_ban.c		\
 			  crm_resource_print.c		\
 			  crm_resource_runtime.c
 crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  	\
 			  $(top_builddir)/lib/fencing/libstonithd.la	\
 			  $(top_builddir)/lib/lrmd/liblrmd.la 		\
 			  $(top_builddir)/lib/services/libcrmservice.la \
 			  $(top_builddir)/lib/pengine/libpe_status.la 	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_rule_SOURCES 	= crm_rule.c
 crm_rule_LDADD		= $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/pengine/libpe_rules.la   \
 			  $(top_builddir)/lib/pengine/libpe_status.la   \
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 iso8601_SOURCES		= iso8601.c
 iso8601_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la
 
 attrd_updater_SOURCES	= attrd_updater.c
 attrd_updater_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la
 
 crm_ticket_SOURCES	= crm_ticket.c
 crm_ticket_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la	\
 			  $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 stonith_admin_SOURCES	= stonith_admin.c
 stonith_admin_LDADD	= $(top_builddir)/lib/pacemaker/libpacemaker.la	\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/lib/fencing/libstonithd.la \
 			  $(top_builddir)/lib/common/libcrmcommon.la
 
 if BUILD_SERVICELOG
 notifyServicelogEvent_SOURCES	= notifyServicelogEvent.c
 notifyServicelogEvent_CFLAGS	= $(SERVICELOG_CFLAGS)
 notifyServicelogEvent_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
 endif
 
 if BUILD_OPENIPMI_SERVICELOG
 ipmiservicelogd_SOURCES	= ipmiservicelogd.c
 ipmiservicelogd_CFLAGS	= $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
 ipmiservicelogd_LDFLAGS	= $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
 endif
 
 CLEANFILES = $(man8_MANS)