diff --git a/anaconda.te b/anaconda.te
index e81bdbd..6f1384c 100644
--- a/anaconda.te
+++ b/anaconda.te
@@ -1,4 +1,8 @@
-policy_module(anaconda, 1.6.0)
+policy_module(anaconda, 1.6.1)
+
+gen_require(`
+	class passwd all_passwd_perms;
+')
 
 ########################################
 #
@@ -8,6 +12,7 @@ policy_module(anaconda, 1.6.0)
 type anaconda_t;
 type anaconda_exec_t;
 domain_type(anaconda_t)
+domain_entry_file(anaconda_t, anaconda_exec_t)
 domain_obj_id_change_exemption(anaconda_t)
 role system_r types anaconda_t;
 
@@ -17,13 +22,12 @@ role system_r types anaconda_t;
 #
 
 allow anaconda_t self:process execmem;
+allow anaconda_t self:passwd { rootok passwd chfn chsh };
 
 kernel_domtrans_to(anaconda_t, anaconda_exec_t)
 
 init_domtrans_script(anaconda_t)
 
-libs_domtrans_ldconfig(anaconda_t)
-
 logging_send_syslog_msg(anaconda_t)
 
 modutils_domtrans_insmod(anaconda_t)
@@ -34,10 +38,6 @@ seutil_domtrans_semanage(anaconda_t)
 userdom_user_home_dir_filetrans_user_home_content(anaconda_t, { dir file lnk_file fifo_file sock_file })
 
 optional_policy(`
-	kudzu_domtrans(anaconda_t)
-')
-
-optional_policy(`
 	rpm_domtrans(anaconda_t)
 	rpm_domtrans_script(anaconda_t)
 ')
@@ -51,9 +51,5 @@ optional_policy(`
 ')
 
 optional_policy(`
-	unconfined_domain(anaconda_t)
-')
-
-optional_policy(`
-	usermanage_domtrans_admin_passwd(anaconda_t)
+	unconfined_domain_noaudit(anaconda_t)
 ')