diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index ef6113c2..646f69c2 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,48 +1,49 @@
 $(TARGET): $(SRC)
+	mkdir -p `dirname $@`
 	bash $(top_srcdir)/scripts/fenceparse \
 		$(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \
 		$(VERSION) \
 		$(abs_srcdir) $@ | \
 	sed \
 		-e 's#@''PYTHON@#${PYTHON}#g' \
 		-e 's#@''FENCEAGENTSLIBDIR@#${FENCEAGENTSLIBDIR}#g' \
 		-e 's#@''LOGDIR@#${LOGDIR}#g' \
 		-e 's#@''SBINDIR@#${sbindir}#g' \
 		-e 's#@''LIBEXECDIR@#${libexecdir}#g' \
 		-e 's#@''IPMITOOL_PATH@#${IPMITOOL_PATH}#g' \
 		-e 's#@''AMTTOOL_PATH@#${AMTTOOL_PATH}#g' \
 		-e 's#@''GNUTLSCLI_PATH@#${GNUTLSCLI_PATH}#g' \
 		-e 's#@''COROSYNC_CMAPCTL_PATH@#${COROSYNC_CMAPCTL_PATH}#g' \
 		-e 's#@''SG_PERSIST_PATH@#${SG_PERSIST_PATH}#g' \
 		-e 's#@''SG_TURS_PATH@#${SG_TURS_PATH}#g' \
 		-e 's#@''VGS_PATH@#${VGS_PATH}#g' \
 		-e 's#@''SUDO_PATH@#${SUDO_PATH}#g' \
 		-e 's#@''SSH_PATH@#${SSH_PATH}#g' \
 		-e 's#@''TELNET_PATH@#${TELNET_PATH}#g' \
 		-e 's#@''MPATH_PATH@#${MPATH_PATH}#g' \
 		-e 's#@''SBD_PATH@#${SBD_PATH}#g' \
 		-e 's#@''STORE_PATH@#${CLUSTERVARRUN}#g' \
 		-e 's#@''SUDO_PATH@#${SUDO_PATH}#g' \
 		-e 's#@''SNMPWALK_PATH@#${SNMPWALK_PATH}#g' \
 		-e 's#@''SNMPSET_PATH@#${SNMPSET_PATH}#g' \
 		-e 's#@''SNMPGET_PATH@#${SNMPGET_PATH}#g' \
 		-e 's#@''NOVA_PATH@#${NOVA_PATH}#g' \
 	> $@
 
 	if [ 0 -eq `echo "$(@)" | grep fence_ &> /dev/null; echo $$?` ]; then \
 		PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(top_srcdir)/fence/agents/lib/check_used_options.py $@; \
 	else true ; fi
 
 	for x in `PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
 		cp $(@) $(@D)/$$x; \
 		$(MAKE) $(@D)/$$x.8; \
 	done
 
 clean: clean-man
 	rm -f $(CLEAN_TARGET:%.8=%) $(CLEAN_TARGET_ADDITIONAL) $(scsidata_SCRIPTS) kdump/fence_kdump_send */*.pyc */*.wiki
 
 	if [ "$(abs_builddir)" = "$(abs_top_builddir)/fence/agents/lib" ]; then \
 		rm -f $(TARGET); \
 	fi
 
 clean-local: clean
diff --git a/make/fenceman.mk b/make/fenceman.mk
index 29e05d7a..1496eb4a 100644
--- a/make/fenceman.mk
+++ b/make/fenceman.mk
@@ -1,11 +1,11 @@
 %.8: $(TARGET) $(top_srcdir)/fence/agents/lib/fence2man.xsl
 	set -e && \
-	PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib \
+	PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib:$(abs_builddir)/lib \
 		$(PYTHON) $(@:%.8=%) -o metadata > $(@D)/.$(@F).tmp && \
 	xmllint --noout --relaxng $(abs_srcdir)/lib/metadata.rng $(@D)/.$(@F).tmp && \
 	xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl $(@D)/.$(@F).tmp > $@
 	xsltproc $(top_srcdir)/fence/agents/lib/fence2wiki.xsl $(@D)/.$(@F).tmp | grep -v '<?xml' > $(@D)/$(@F:%.8=%.wiki)
 
 clean-man:
 	$(eval CLEAN_TARGET=$(shell find -name "*.8" | grep -Pv "kdump/fence_kdump_send.8|manual/fence_ack_manual.8"))
 	rm -f $(CLEAN_TARGET) */.*.8.tmp */*.wiki