diff --git a/ctdb.te b/ctdb.te
index 47199aa..ac0508e 100644
--- a/ctdb.te
+++ b/ctdb.te
@@ -97,9 +97,12 @@ corenet_udp_bind_ctdb_port(ctdbd_t)
 corenet_tcp_bind_smbd_port(ctdbd_t)
 corenet_tcp_connect_ctdb_port(ctdbd_t)
 corenet_tcp_sendrecv_ctdb_port(ctdbd_t)
+corenet_tcp_connect_gluster_port(ctdbd_t)
+corenet_tcp_connect_nfs_port(ctdbd_t)
 
 corecmd_exec_bin(ctdbd_t)
 corecmd_exec_shell(ctdbd_t)
+corecmd_getattr_all_executables(ctdbd_t)
 
 dev_read_sysfs(ctdbd_t)
 dev_read_urand(ctdbd_t)
@@ -131,6 +134,12 @@ optional_policy(`
 ')
 
 optional_policy(`
+    rpc_domtrans_rpcd(ctdbd_t)
+    rpc_manage_nfs_state_data_dir(ctdbd_t)
+    rpc_read_nfs_state_data(ctdbd_t)
+')
+
+optional_policy(`
     samba_signull_smbd(ctdbd_t)
 	samba_initrc_domtrans(ctdbd_t)
 	samba_domtrans_net(ctdbd_t)
diff --git a/glusterd.fc b/glusterd.fc
index 52b4110..a3633cd 100644
--- a/glusterd.fc
+++ b/glusterd.fc
@@ -6,6 +6,13 @@
 /usr/sbin/glusterd	--	gen_context(system_u:object_r:glusterd_initrc_exec_t,s0)
 /usr/sbin/glusterfsd	--	gen_context(system_u:object_r:glusterd_exec_t,s0)
 
+/usr/sbin/glustereventsd   -- 	gen_context(system_u:object_r:glusterd_exec_t,s0)
+/usr/sbin/gluster-eventsapi   -- 	gen_context(system_u:object_r:glusterd_exec_t,s0)
+
+
+/usr/libexec/glusterfs/peer_eventsapi.py    -- 	gen_context(system_u:object_r:glusterd_exec_t,s0)
+/usr/libexec/glusterfs/events/glustereventsd.py   -- 	gen_context(system_u:object_r:glusterd_exec_t,s0)
+
 /usr/bin/ganesha.nfsd	--	gen_context(system_u:object_r:glusterd_exec_t,s0)
 
 /opt/glusterfs/[^/]+/sbin/glusterfsd	--	gen_context(system_u:object_r:glusterd_exec_t,s0)
diff --git a/glusterd.te b/glusterd.te
index 48811e2..a8877f7 100644
--- a/glusterd.te
+++ b/glusterd.te
@@ -59,7 +59,7 @@ files_type(glusterd_brick_t)
 # Local policy
 #
 
-allow glusterd_t self:capability { sys_admin sys_resource sys_ptrace dac_override chown dac_read_search fowner fsetid kill setgid setuid net_admin mknod net_raw };
+allow glusterd_t self:capability { sys_admin sys_resource sys_ptrace dac_override chown dac_read_search fowner fsetid ipc_lock kill setgid setuid net_admin mknod net_raw };
 
 allow glusterd_t self:capability2 block_suspend;
 allow glusterd_t self:process { getcap setcap setrlimit signal_perms setsched getsched setfscreate};
@@ -132,6 +132,7 @@ corenet_raw_bind_generic_node(glusterd_t)
 
 corenet_tcp_connect_gluster_port(glusterd_t)
 corenet_tcp_bind_gluster_port(glusterd_t)
+corenet_udp_bind_gluster_port(glusterd_t)
 
 # replacement for rpc.mountd
 corenet_sendrecv_all_server_packets(glusterd_t)
@@ -155,6 +156,7 @@ corenet_tcp_connect_all_ports(glusterd_t)
 dev_read_sysfs(glusterd_t)
 dev_read_urand(glusterd_t)
 dev_read_rand(glusterd_t)
+dev_rw_infiniband_dev(glusterd_t)
 
 domain_read_all_domains_state(glusterd_t)
 domain_getattr_all_sockets(glusterd_t)
@@ -164,6 +166,7 @@ domain_use_interactive_fds(glusterd_t)
 fs_mount_all_fs(glusterd_t)
 fs_unmount_all_fs(glusterd_t)
 fs_getattr_all_fs(glusterd_t)
+fs_getattr_all_dirs(glusterd_t)
 
 files_mounton_non_security(glusterd_t)
 
@@ -185,6 +188,7 @@ init_read_script_state(glusterd_t)
 init_rw_script_tmp_files(glusterd_t)
 init_manage_script_status_files(glusterd_t)
 init_status(glusterd_t)
+init_stop_transient_unit(glusterd_t)
 
 systemd_config_systemd_services(glusterd_t)
 systemd_signal_passwd_agent(glusterd_t)
@@ -203,6 +207,7 @@ userdom_read_user_tmp_files(glusterd_t)
 userdom_delete_user_tmp_files(glusterd_t)
 userdom_rw_user_tmp_files(glusterd_t)
 userdom_kill_all_users(glusterd_t)
+userdom_signal_unpriv_users(glusterd_t)
 
 mount_domtrans(glusterd_t)
 
diff --git a/puppet.te b/puppet.te
index b80cb1e..46a4b5d 100644
--- a/puppet.te
+++ b/puppet.te
@@ -354,6 +354,7 @@ optional_policy(`
 ')
 
 optional_policy(`
+    systemd_dbus_chat_timedated(puppetagent_t)
 	systemd_dbus_chat_timedated(puppetmaster_t)
 ')
 
diff --git a/rhcs.te b/rhcs.te
index ce1ca24..4c9f2b6 100644
--- a/rhcs.te
+++ b/rhcs.te
@@ -275,6 +275,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+    fprintd_dbus_chat(cluster_t)
+')
+
+optional_policy(`
     ldap_systemctl(cluster_t)
 ')
 
diff --git a/virt.if b/virt.if
index 2397aeb..17156a6 100644
--- a/virt.if
+++ b/virt.if
@@ -1408,6 +1408,8 @@ interface(`virt_transition_svirt_sandbox',`
 	role $2 types svirt_sandbox_domain;
 	allow $1 svirt_sandbox_domain:unix_dgram_socket sendto;
 
+	allow svirt_sandbox_domain $1:fd use;
+
 	allow svirt_sandbox_domain $1:fifo_file rw_fifo_file_perms;
 	allow svirt_sandbox_domain $1:process sigchld;
 	ps_process_pattern($1, svirt_sandbox_domain)
diff --git a/virt.te b/virt.te
index 69333cf..6dd64f3 100644
--- a/virt.te
+++ b/virt.te
@@ -1316,6 +1316,7 @@ kernel_list_all_proc(svirt_sandbox_domain)
 kernel_read_all_proc(svirt_sandbox_domain)
 kernel_read_all_sysctls(svirt_sandbox_domain)
 kernel_read_net_sysctls(svirt_sandbox_domain)
+kernel_rw_unix_sysctls(svirt_sandbox_domain)
 kernel_dontaudit_search_kernel_sysctl(svirt_sandbox_domain)
 kernel_dontaudit_access_check_proc(svirt_sandbox_domain)
 kernel_dontaudit_setattr_proc_files(svirt_sandbox_domain)
@@ -1470,6 +1471,7 @@ allow svirt_lxc_net_t virt_lxc_var_run_t:file read_file_perms;
 
 kernel_read_irq_sysctls(svirt_lxc_net_t)
 kernel_read_messages(svirt_lxc_net_t)
+kernel_rw_usermodehelper_state(svirt_lxc_net_t)
 
 dev_read_sysfs(svirt_lxc_net_t)
 dev_read_mtrr(svirt_lxc_net_t)