diff --git a/refpolicy/policy/modules/services/nis.if b/refpolicy/policy/modules/services/nis.if
index 27328b3..2a2a5fd 100644
--- a/refpolicy/policy/modules/services/nis.if
+++ b/refpolicy/policy/modules/services/nis.if
@@ -45,12 +45,14 @@ interface(`nis_use_ypbind',`
 		corenet_dontaudit_tcp_connect_all_reserved_ports($1)
 
 		sysnet_read_config($1)
+	',`
+		dontaudit $1 var_yp_t:dir search;
+	')
 
-		optional_policy(`mount.te',`
+	optional_policy(`mount.te',`
+		tunable_policy(`allow_ypbind',`
 			mount_send_nfs_client_request($1)
 		')
-	',`
-		dontaudit $1 var_yp_t:dir search;
 	')
 ')