diff --git a/SOURCES/bz1332435-nfsserver-var-lib-nfs-fix.patch b/SOURCES/bz1332435-nfsserver-var-lib-nfs-fix.patch
new file mode 100644
index 0000000..3ecc3bf
--- /dev/null
+++ b/SOURCES/bz1332435-nfsserver-var-lib-nfs-fix.patch
@@ -0,0 +1,29 @@
+diff -uNr a/heartbeat/nfsserver b/heartbeat/nfsserver
+--- a/heartbeat/nfsserver	2016-04-11 10:28:05.988977035 +0200
++++ b/heartbeat/nfsserver	2016-04-11 16:31:50.150445968 +0200
+@@ -332,7 +332,11 @@
+ 
+ 	case $EXEC_MODE in 
+ 		1) ${OCF_RESKEY_nfs_init_script} $cmd;;
+-		2) systemctl $cmd ${svc}.service ;;
++		2) if ! echo $svc | grep -q "\."; then
++			svc="${svc}.service"
++		   fi
++		   systemctl $cmd $svc
++		   ;;
+ 	esac
+ }
+ 
+@@ -587,6 +591,12 @@
+ 		ocf_log debug "$fp is already bound to /var/lib/nfs"
+ 		return 0
+ 	fi
++
++	if nfs_exec status var-lib-nfs-rpc_pipefs.mount; then
++		ocf_log debug "/var/lib/nfs/rpc_pipefs already mounted. Unmounting in preparation to bind mount nfs dir"
++		systemctl stop var-lib-nfs-rpc_pipefs.mount
++	fi
++
+ 	mount --bind $fp /var/lib/nfs
+ 	[ $SELINUX_ENABLED -eq 0 ] && restorecon /var/lib/nfs
+ }
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index e4bf573..92ff257 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -32,7 +32,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	3.9.5
-Release:	54%{?dist}.9
+Release:	54%{?dist}.10
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -136,6 +136,7 @@ Patch91:	bz1316633-backup-and-restore-rabbitmq-users-during-resource-re.patch
 Patch92:	bz1318744-galera-crash-recovery.patch
 Patch93:	bz1318744-galera-heuristic-recovered.patch
 Patch94:	bz1318744-galera-no-grastate.patch
+Patch95:	bz1332435-nfsserver-var-lib-nfs-fix.patch
 
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
@@ -335,6 +336,7 @@ exit 1
 %patch92 -p1
 %patch93 -p1
 %patch94 -p1
+%patch95 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -587,6 +589,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Tue May  3 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.9.5-54.10
+- nfsserver: fix nfs-idmapd fails to start due to var-lib-nfs-rpc_pipefs.mount being active
+
+  Resolves: rhbz#1332435
+
 * Thu Mar 17 2016 Damien Ciabrini <dciabrin@redhat.com> - 3.9.5-54.9
 - galera: recover blocked nodes with --tc-heuristics-recover