diff --git a/cib/Makefile.am b/cib/Makefile.am
index 12493eea12..220451d01b 100644
--- a/cib/Makefile.am
+++ b/cib/Makefile.am
@@ -1,61 +1,62 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl
 
 EXTRA_DIST	= cib.pam
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(CRM_DAEMON_DIR)
 commmoddir	= $(halibdir)/modules/comm
 
 COMMONLIBS	= $(top_builddir)/lib/common/libcrmcommon.la	\
 		  $(top_builddir)/lib/cib/libcib.la
 
 ## binary progs
 halib_PROGRAMS	= cib cibmon
 
 if BUILD_HELP
-man8_MANS =	
+man8_MANS =
 %.8:	%
 	echo Creating $@
-	chmod a+x $<
+	chmod a+x $(top_builddir)/cib/$<
+	$(top_builddir)/cib/$< --help
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/cib/$<
 endif
 
 ## SOURCES
 noinst_HEADERS          = callbacks.h cibio.h cibmessages.h common.h notify.h
 
 cib_SOURCES		= io.c messages.c notify.c	\
 			callbacks.c main.c remote.c common.c
 
 cib_LDADD		= $(top_builddir)/lib/cluster/libcrmcluster.la \
 			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
 
 cibmon_SOURCES		= cibmon.c
-cibmon_LDADD		= $(COMMONLIBS) 
+cibmon_LDADD		= $(COMMONLIBS)
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 #	cp -f $(top_srcdir)/crm/cib/cib.pam $(DESTDIR)/etc/pam.d/cib
 
 uninstall-local:
diff --git a/fencing/Makefile.am b/fencing/Makefile.am
index f26c0da0b9..1fcd70659f 100644
--- a/fencing/Makefile.am
+++ b/fencing/Makefile.am
@@ -1,90 +1,91 @@
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS =
 
 ## binary progs
 testdir			= $(datadir)/$(PACKAGE)/tests/fencing
 test_SCRIPTS		= regression.py
 
 halibdir	= $(CRM_DAEMON_DIR)
 halib_PROGRAMS	= stonithd stonith-test
 
 sbin_PROGRAMS  = stonith_admin
 sbin_SCRIPTS   = fence_legacy fence_pcmk
 
 noinst_HEADERS = internal.h
 
 man7_MANS      =
 man8_MANS      =
 
 if BUILD_XML_HELP
 man7_MANS +=	stonithd.7
 stonithd.xml:	stonithd
 	$(top_builddir)/fencing/$< metadata | $(XSLTPROC) --nonet --novalid --stringparam man.name $< $(top_srcdir)/xml/ocf-meta2man.xsl - > $(top_builddir)/fencing/$@
 
 stonithd.7:	stonithd.xml
 	$(XSLTPROC) $(MANPAGE_XSLT) $(top_builddir)/fencing/$<
 endif
 
 if BUILD_HELP
 man8_MANS +=	$(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
 %.8:	%
 	echo Creating $@
-	chmod a+x $<
+	chmod a+x $(top_builddir)/fencing/$<
+	$(top_builddir)/fencing/$< --help
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/fencing/$<
 endif
 
 stonith_test_SOURCES	= test.c
 
 stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 stonith_admin_SOURCES	= admin.c
 
 stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cib/libcib.la		\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 stonithd_CFLAGS		= -I$(top_srcdir)/pengine
 stonithd_SOURCES	= main.c commands.c remote.c
 if BUILD_STONITH_CONFIG
 BUILT_SOURCES 		= standalone_config.h
 
 stonithd_SOURCES	+= standalone_config.c config.y config.l
 stonithd_AM_LFLAGS 	= -o$(LEX_OUTPUT_ROOT).c
 
 # lex/yacc issues:
 
 endif
 stonithd_YFLAGS 	= -d
 
 stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/pengine/libpengine.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 CFLAGS			= $(CFLAGS_COPY:-Werror=)
diff --git a/lrmd/Makefile.am b/lrmd/Makefile.am
index 0eb02190ca..73f1d7e5c9 100644
--- a/lrmd/Makefile.am
+++ b/lrmd/Makefile.am
@@ -1,63 +1,64 @@
 # Copyright (c) 2012 David Vossel <dvossel@redhat.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
 MAINTAINERCLEANFILES = Makefile.in
 
 testdir			= $(datadir)/$(PACKAGE)/tests/lrmd
 test_SCRIPTS		= regression.py
 
 lrmdlibdir	= $(CRM_DAEMON_DIR)
 lrmdlib_PROGRAMS = lrmd lrmd_test
 
 initdir		 = $(INITDIR)
 init_SCRIPTS	 = pacemaker_remote
 sbin_PROGRAMS	 = pacemaker_remoted
 
 if HAVE_SYSTEMD
 systemdunit_DATA = pacemaker_remote.service
 endif
 
 if BUILD_HELP
 man8_MANS =	$(sbin_PROGRAMS:%=%.8)
 endif
 
 %.8:	%
 	echo Creating $@
 	chmod a+x $(top_builddir)/lrmd/$<
+	$(top_builddir)/lrmd/$< --help
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/lrmd/$<
 
 lrmd_SOURCES	= main.c lrmd.c
 lrmd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/services/libcrmservice.la \
 			$(top_builddir)/lib/lrmd/liblrmd.la  \
 			$(top_builddir)/lib/fencing/libstonithd.la
 
 
 pacemaker_remoted_SOURCES	= main.c lrmd.c tls_backend.c ipc_proxy.c
 pacemaker_remoted_CFLAGS	= -DSUPPORT_REMOTE
 pacemaker_remoted_LDADD		= $(lrmd_LDADD)
 
 
 lrmd_test_SOURCES	= test.c
 lrmd_test_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 \
 			$(top_builddir)/pengine/libpengine.la
 
 noinst_HEADERS  = lrmd_private.h
diff --git a/mcp/Makefile.am b/mcp/Makefile.am
index f3a0f86be0..73a71c4de7 100644
--- a/mcp/Makefile.am
+++ b/mcp/Makefile.am
@@ -1,57 +1,58 @@
 #
 # Copyright (C) 2004-2009 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-MAINTAINERCLEANFILES    = Makefile.in 
+MAINTAINERCLEANFILES    = Makefile.in
 
 if BUILD_CS_SUPPORT
 INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include   \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
 initdir			= $(INITDIR)
 init_SCRIPTS		= pacemaker
-sbin_PROGRAMS		= pacemakerd 
+sbin_PROGRAMS		= pacemakerd
 
 if BUILD_HELP
 man8_MANS =	$(sbin_PROGRAMS:%=%.8)
 endif
 
 if HAVE_SYSTEMD
 systemdunit_DATA = pacemaker.service
 endif
 
 ## SOURCES
 
-noinst_HEADERS		= 
+noinst_HEADERS		=
 
 pacemakerd_SOURCES	= pacemaker.c corosync.c
 pacemakerd_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la
 pacemakerd_LDFLAGS	= $(CLUSTERLIBS)
 
 %.8:	%
 	echo Creating $@
 	chmod a+x $(top_builddir)/mcp/$<
+	$(top_builddir)/mcp/$< --help
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/mcp/$<
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
 
 .PHONY: install-exec-hook
 endif
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e8d0587fa5..ccd1e7ae64 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,166 +1,167 @@
 #
 # Copyright (C) 2004-2009 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-MAINTAINERCLEANFILES    = Makefile.in 
+MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include   \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
 COMMONLIBS	= 							\
 		$(top_builddir)/lib/common/libcrmcommon.la		\
 		$(top_builddir)/lib/cib/libcib.la			\
-		$(CURSESLIBS) $(CLUSTERLIBS) 
+		$(CURSESLIBS) $(CLUSTERLIBS)
 
 headerdir               = $(pkgincludedir)/crm
-header_HEADERS		= 
+header_HEADERS		=
 
 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
 EXTRA_DIST		= $(sbin_SCRIPTS)
 
 halibdir		= $(CRM_DAEMON_DIR)
 halib_PROGRAMS		= attrd
 
 sbin_PROGRAMS		= crm_simulate crmadmin cibadmin crm_node crm_attribute crm_resource crm_verify \
 			 crm_shadow attrd_updater crm_diff crm_mon iso8601 crm_ticket crm_error
 
 clidir			= $(datadir)/$(PACKAGE)/tests/cli
 cli_SCRIPTS		= regression.sh
 cli_DATA		= regression.exp cli.supp
 
 if BUILD_HEARTBEAT_SUPPORT
 sbin_PROGRAMS           += crm_uuid
 endif
 if BUILD_SERVICELOG
 sbin_PROGRAMS		+= notifyServicelogEvent
 endif
 if BUILD_OPENIPMI_SERVICELOG
 sbin_PROGRAMS		+= ipmiservicelogd
 endif
 
 if BUILD_HELP
 man8_MANS =		$(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
 endif
 
 ## SOURCES
 
-noinst_HEADERS		= 
+noinst_HEADERS		=
 
 crmadmin_SOURCES	= crmadmin.c
 crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la \
 			  $(COMMONLIBS) $(CLUSTERLIBS)
 
 crm_error_SOURCES	= crm_error.c
 crm_error_LDADD		= $(COMMONLIBS)
 
 crm_uuid_SOURCES	= crm_uuid.c
 crm_uuid_LDADD		= $(COMMONLIBS) $(top_builddir)/lib/cluster/libcrmcluster.la
 
 cibadmin_SOURCES	= cibadmin.c
-cibadmin_LDADD		= $(COMMONLIBS) 
+cibadmin_LDADD		= $(COMMONLIBS)
 
 crm_shadow_SOURCES	= cib_shadow.c
-crm_shadow_LDADD	= $(COMMONLIBS) 
+crm_shadow_LDADD	= $(COMMONLIBS)
 
 crm_node_SOURCES	= crm_node.c
 crm_node_LDADD		= $(top_builddir)/lib/cluster/libcrmcluster.la \
 			  $(COMMONLIBS) $(CLUSTERLIBS)
 
 crm_simulate_SOURCES	= crm_simulate.c
 crm_simulate_CFLAGS	= -I$(top_srcdir)/pengine
 
 crm_simulate_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la		\
 			$(top_builddir)/pengine/libpengine.la 			\
 			$(top_builddir)/lib/cib/libcib.la			\
 			$(top_builddir)/lib/lrmd/liblrmd.la			\
 			$(top_builddir)/lib/transition/libtransitioner.la	\
 			$(COMMONLIBS)
 
 crm_diff_SOURCES	= xml_diff.c
 crm_diff_LDADD		= $(COMMONLIBS)
 
 crm_mon_SOURCES		= crm_mon.c
 crm_mon_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la		\
 			  $(top_builddir)/lib/fencing/libstonithd.la		\
 			  $(top_builddir)/pengine/libpengine.la \
 			  $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS)
 
 # Arguments could be made that this should live in crm/pengine
 crm_verify_SOURCES	= crm_verify.c
 crm_verify_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la 	\
 			$(top_builddir)/pengine/libpengine.la		\
 			$(COMMONLIBS)
 
 crm_attribute_SOURCES	= crm_attribute.c
-crm_attribute_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(COMMONLIBS) 
+crm_attribute_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(COMMONLIBS)
 
 crm_resource_SOURCES	= crm_resource.c
 crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
 			$(top_builddir)/lib/lrmd/liblrmd.la \
 			$(top_builddir)/lib/services/libcrmservice.la \
 			$(top_builddir)/lib/pengine/libpe_status.la \
 			$(top_builddir)/pengine/libpengine.la \
 			$(COMMONLIBS)
 
 iso8601_SOURCES		= test.iso8601.c
-iso8601_LDADD		= $(COMMONLIBS) 
+iso8601_LDADD		= $(COMMONLIBS)
 
 attrd_SOURCES		= attrd.c
 attrd_LDADD		= $(top_builddir)/lib/cluster/libcrmcluster.la $(COMMONLIBS)
 
 #pingd_SOURCES		= pingd.c
 #pingd_LDADD		= $(COMMONLIBS)
 
 attrd_updater_SOURCES	= attrd_updater.c
 attrd_updater_LDADD	= $(COMMONLIBS)
 
 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)/pengine/libpengine.la \
 			$(COMMONLIBS)
 
 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_CFLAGS	= $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
 ipmiservicelogd_LDFLAGS	= $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
 endif
 
 %.8:	% crm_attribute
 	echo Creating $@
 	chmod a+x $(top_builddir)/tools/$<
+	$(top_builddir)/tools/$< --help
 	PATH=$(top_builddir)/tools:$$PATH $(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/tools/$<
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
 
 .PHONY: install-exec-hook