diff -urN fence-agents-4.0.2.orig/configure.ac fence-agents-4.0.2/configure.ac
--- fence-agents-4.0.2.orig/configure.ac	2014-02-17 14:55:59.768097454 +0100
+++ fence-agents-4.0.2/configure.ac	2014-02-17 14:57:05.567548670 +0100
@@ -243,6 +243,8 @@
 CPPFLAGS="-I\$(top_builddir)/make -I\$(top_srcdir)/make -I. $ENV_CPPFLAGS"
 LDFLAGS="$ENV_LDFLAGS"
 
+AC_PATH_PROG([GNUTLSCLI_PATH], [gnutlscli], [/usr/bin/gnutls-cli])
+
 AC_CONFIG_FILES([Makefile
 		 fence/Makefile
 		 fence/agents/Makefile
@@ -276,7 +278,6 @@
 		 fence/agents/lpar/Makefile
 		 fence/agents/manual/Makefile
 		 fence/agents/mcdata/Makefile
-		 fence/agents/nss_wrapper/Makefile
 		 fence/agents/rackswitch/Makefile
 		 fence/agents/ovh/Makefile
 		 fence/agents/rhevm/Makefile
diff -urN fence-agents-4.0.2.orig/fence/agents/Makefile.am fence-agents-4.0.2/fence/agents/Makefile.am
--- fence-agents-4.0.2.orig/fence/agents/Makefile.am	2014-02-17 14:55:59.774097497 +0100
+++ fence-agents-4.0.2/fence/agents/Makefile.am	2014-02-17 14:58:09.426990207 +0100
@@ -1,5 +1,4 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 SUBDIRS 		= lib \
-			  nss_wrapper \
 			  $(AGENTS_LIST)
diff -urN fence-agents-4.0.2.orig/make/fencebuild.mk fence-agents-4.0.2/make/fencebuild.mk
--- fence-agents-4.0.2.orig/make/fencebuild.mk	2014-02-17 14:55:59.768097454 +0100
+++ fence-agents-4.0.2/make/fencebuild.mk	2014-02-17 14:59:06.653383134 +0100
@@ -9,6 +9,7 @@
 		-e 's#@''LOGDIR@#${LOGDIR}#g' \
 		-e 's#@''SBINDIR@#${sbindir}#g' \
 		-e 's#@''LIBEXECDIR@#${libexecdir}#g' \
+		-e 's#@''GNUTLSCLI_PATH@#${GNUTLSCLI_PATH}#g' \
 	> $@
 
 	if [ 0 -eq `echo "$(SRC)" | grep fence_ &> /dev/null; echo $$?` ]; then \