diff --git a/fence/agents/lib/check_used_options.py b/fence/agents/lib/check_used_options.py
old mode 100755
new mode 100644
index b90bc056..6ed3827e
--- a/fence/agents/lib/check_used_options.py
+++ b/fence/agents/lib/check_used_options.py
@@ -1,65 +1,63 @@
-#!/usr/bin/python -tt
-
 ## Check if fence agent uses only options["--??"] which are defined in fencing library or
 ## fence agent itself
 ##
 ## Usage: ./check_used_options.py fence-agent (e.g. lpar/fence_lpar.py)
 ##
 
 import sys, re
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import all_opt
 
 def main():
 	agent = sys.argv[1]
 
 	available = {}
 
 	## all_opt from fencing library are imported
 	for k in list(all_opt.keys()):
 		if "longopt" in all_opt[k]:
 			available["--" + all_opt[k]["longopt"]] = True
 
 	## add UUID which is derived automatically from --plug if possible
 	available["--uuid"] = True
 
 	## all_opt defined in fence agent are found
 	agent_file = open(agent)
 	opt_re = re.compile(r"\s*all_opt\[\"([^\"]*)\"\] = {")
 	opt_longopt_re = re.compile(r"\s*\"longopt\" : \"([^\"]*)\"")
 
 	in_opt = False
 	for line in agent_file:
 		if opt_re.search(line) != None:
 			in_opt = True
 		if in_opt and opt_longopt_re.search(line) != None:
 			available["--" + opt_longopt_re.search(line).group(1)] = True
 			in_opt = False
 
 	## check if all options are defined
 	agent_file = open(agent)
 	option_use_re = re.compile(r"options\[\"(-[^\"]*)\"\]")
 	option_has_re = re.compile(r"options.has_key\(\"(-[^\"]*)\"\)")
 
 	counter = 0
 	without_errors = True
 	for line in agent_file:
 		counter += 1
 
 		for option in option_use_re.findall(line):
 			if option not in available:
 				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_use_re.search(line).group(1)))
 				without_errors = False
 
 		for option in option_has_re.findall(line):
 			if option not in available:
 				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_has_re.search(line).group(1)))
 				without_errors = False
 
 	if without_errors:
 		sys.exit(0)
 	else:
 		sys.exit(1)
 
 if __name__ == "__main__":
 	main()
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index f80a5881..a8d205e5 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,84 +1,84 @@
 define gen_agent_from_py
 	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#@''OPENSTACK_PATH@#${OPENSTACK_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' \
 		-e 's#@''POWERMAN_PATH@#${POWERMAN_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 $@; \
+		PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $(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 -f $(@) $(@D)/$$x; \
 		$(MAKE) $(@D)/$$x.8; \
 	done
 endef
 
 # dependency, one on one
 $(foreach t,$(TARGET),$(eval $(t) : $(t:=.py)))
 
 # rule
 $(TARGET):
 	$(call gen_agent_from_py)
 
 clean: clean-man
 	rm -f $(CLEAN_TARGET:%.8=%) $(CLEAN_TARGET_ADDITIONAL) $(scsidata_SCRIPTS) */*.pyc */*.wiki
 
 	if [ "$(abs_builddir)" = "$(abs_top_builddir)/fence/agents/lib" ]; then \
 		rm -f $(TARGET); \
 	fi
 
 clean-local: clean
 
 install-exec-hook: $(TARGET)
 	if [ -n "$(man8dir)" ]; then \
 		echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
 		$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
 	fi
 	for p in $(TARGET); do \
 		dir=`dirname $$p`; \
 		for x in `PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
 			echo " $(INSTALL_SCRIPT) $$dir/$$x '$(DESTDIR)$(sbindir)'"; \
 			$(INSTALL_SCRIPT) $$dir/$$x "$(DESTDIR)$(sbindir)" || exit $$?; \
 			echo " $(INSTALL_DATA) '$$dir/$$x.8' '$(DESTDIR)$(man8dir)'"; \
 			$(INSTALL_DATA) "$$dir/$$x.8" "$(DESTDIR)$(man8dir)" || exit $$?; \
 		done; \
 	done
 
 uninstall-hook: $(TARGET)
 	files=`for p in $(TARGET); do \
 		for x in \`PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
 			echo " rm -f '$(DESTDIR)$(sbindir)/$$x'"; \
 			rm -f "$(DESTDIR)$(sbindir)/$$x"; \
 			echo " rm -f '$(DESTDIR)$(man8dir)/$$x.8'"; \
 			rm -f "$(DESTDIR)$(man8dir)/$$x.8"; \
 		done; \
 	done`