diff --git a/policy/modules/apps/wireshark.te b/policy/modules/apps/wireshark.te
index 0a1901aec..d8e0c928c 100644
--- a/policy/modules/apps/wireshark.te
+++ b/policy/modules/apps/wireshark.te
@@ -1,5 +1,5 @@
 
-policy_module(wireshark, 2.0.0)
+policy_module(wireshark, 2.0.1)
 
 ########################################
 #
@@ -119,6 +119,6 @@ optional_policy(`
 ')
 
 optional_policy(`
-	xserver_user_client(wireshark_t, wireshark_tmpfs_t)
+	xserver_user_x_domain_template(wireshark, wireshark_t, wireshark_tmpfs_t)
 	xserver_create_xdm_tmp_sockets(wireshark_t)
 ')
diff --git a/policy/modules/services/xserver.if b/policy/modules/services/xserver.if
index 88f0dcc24..6a0f5c15c 100644
--- a/policy/modules/services/xserver.if
+++ b/policy/modules/services/xserver.if
@@ -297,7 +297,7 @@ interface(`xserver_rw_session',`
 ## </param>
 #
 interface(`xserver_user_client',`
-#	refpolicywarn(`$0() has been deprecated, please use xserver_user_x_domain_template instead.')
+	refpolicywarn(`$0() has been deprecated, please use xserver_user_x_domain_template instead.')
 	gen_require(`
 		type xdm_t, xdm_tmp_t;
 		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te
index 69b83083c..fc421d515 100644
--- a/policy/modules/services/xserver.te
+++ b/policy/modules/services/xserver.te
@@ -1,5 +1,5 @@
 
-policy_module(xserver, 3.2.2)
+policy_module(xserver, 3.2.3)
 
 gen_require(`
 	class x_drawable all_x_drawable_perms;
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 09cc86dee..1c139ffd0 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -439,7 +439,7 @@ template(`userdom_xwindows_client_template',`
 	# GNOME checks for usb and other devices:
 	dev_rw_usbfs($1_t)
 
-	xserver_user_client($1_t, user_tmpfs_t)
+	xserver_user_x_domain_template($1, $1_t, user_tmpfs_t)
 	xserver_xsession_entry_type($1_t)
 	xserver_dontaudit_write_log($1_t)
 	xserver_stream_connect_xdm($1_t)
diff --git a/policy/modules/system/userdomain.te b/policy/modules/system/userdomain.te
index c940bc92a..1931d88b5 100644
--- a/policy/modules/system/userdomain.te
+++ b/policy/modules/system/userdomain.te
@@ -1,5 +1,5 @@
 
-policy_module(userdomain, 4.2.1)
+policy_module(userdomain, 4.2.2)
 
 ########################################
 #