diff --git a/policy/modules/system/unconfined.te b/policy/modules/system/unconfined.te
index 7f6794b..aecd671 100644
--- a/policy/modules/system/unconfined.te
+++ b/policy/modules/system/unconfined.te
@@ -1,5 +1,5 @@
 
-policy_module(unconfined, 2.3.0)
+policy_module(unconfined, 2.3.1)
 
 ########################################
 #
@@ -159,6 +159,7 @@ optional_policy(`
 ')
 
 optional_policy(`
+	postfix_per_role_template(unconfined, unconfined_t, unconfined_r)
 	postfix_run_map(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
 	# cjp: this should probably be removed:
 	postfix_domtrans_master(unconfined_t)
@@ -170,6 +171,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	qmail_per_role_template(unconfined, unconfined_t, unconfined_r)
+')
+
+optional_policy(`
 	# cjp: this should probably be removed:
 	rpc_domtrans_nfsd(unconfined_t)
 ')