diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index ad77fafc..0ab624a5 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -2,6 +2,7 @@
 	* Add missing parts of unix stream socket connect interface
 	  of ipsec.
 	* Rename inetd connect interface for consistency.
+	* Misc. cleanups.
 	* Added policies:
 		mysql
 
diff --git a/refpolicy/policy/modules/system/ipsec.te b/refpolicy/policy/modules/system/ipsec.te
index a73e707e..cc06b3e6 100644
--- a/refpolicy/policy/modules/system/ipsec.te
+++ b/refpolicy/policy/modules/system/ipsec.te
@@ -13,15 +13,17 @@ role system_r types ipsec_t;
 
 # type for ipsec configuration file(s) - not for keys
 type ipsec_conf_file_t;
+files_type(ipsec_conf_file_t)
 
 # type for file(s) containing ipsec keys - RSA or preshared
 type ipsec_key_file_t;
+files_type(ipsec_key_file_t)
 
 # type for runtime files, including pluto.ctl
 type ipsec_var_run_t;
 files_pid_file(ipsec_var_run_t)
 
-type ipsec_mgmt_t; # admin, privmodule;
+type ipsec_mgmt_t;
 type ipsec_mgmt_exec_t;
 init_system_domain(ipsec_mgmt_t,ipsec_mgmt_exec_t)
 role system_r types ipsec_mgmt_t;
@@ -37,6 +39,7 @@ files_pid_file(ipsec_mgmt_var_run_t)
 allow ipsec_t self:capability { net_admin dac_override dac_read_search };
 dontaudit ipsec_t self:capability sys_tty_config;
 allow ipsec_t self:process signal;
+allow ipsec_t self:tcp_socket create_stream_socket_perms;
 allow ipsec_t self:key_socket { create write read setopt };
 allow ipsec_t self:fifo_file { read getattr };
 
@@ -74,6 +77,13 @@ kernel_read_software_raid_state(ipsec_t)
 kernel_getattr_core(ipsec_t)
 kernel_getattr_message_if(ipsec_t)
 
+# Pluto needs network access
+corenet_tcp_sendrecv_all_if(ipsec_t)
+corenet_raw_sendrecv_all_if(ipsec_t)
+corenet_tcp_sendrecv_all_nodes(ipsec_t)
+corenet_raw_sendrecv_all_nodes(ipsec_t)
+corenet_tcp_sendrecv_all_ports(ipsec_t)
+corenet_tcp_bind_all_nodes(ipsec_t)
 corenet_udp_bind_reserved_port(ipsec_t)
 
 dev_read_sysfs(ipsec_t)
@@ -84,6 +94,7 @@ fs_getattr_all_fs(ipsec_t)
 fs_search_auto_mountpoints(ipsec_t)
 
 term_use_console(ipsec_t)
+term_dontaudit_use_all_user_ttys(ipsec_t)
 
 corecmd_exec_shell(ipsec_t)
 corecmd_exec_bin(ipsec_t)
@@ -102,6 +113,8 @@ logging_send_syslog_msg(ipsec_t)
 
 miscfiles_read_localization(ipsec_t)
 
+sysnet_read_config(ipsec_t)
+
 userdom_dontaudit_use_unpriv_user_fd(ipsec_t)
 userdom_dontaudit_search_sysadm_home_dir(ipsec_t)
 
@@ -127,14 +140,6 @@ optional_policy(`udev.te', `
 	udev_read_db(ipsec_t)
 ')
 
-ifdef(`TODO',`
-allow ipsec_t etc_t:lnk_file read;
-allow ipsec_t initrc_t:fifo_file write;
-dontaudit ipsec_t ttyfile:chr_file { read write };
-# Pluto needs network access
-can_network_server(ipsec_t)
-') dnl end TODO
-
 ########################################
 #
 # ipsec_mgmt Local policy
@@ -241,6 +246,8 @@ libs_use_shared_libs(ipsec_mgmt_t)
 
 miscfiles_read_localization(ipsec_mgmt_t)
 
+modutils_domtrans_insmod(ipsec_mgmt_t)
+
 seutil_dontaudit_search_config(ipsec_mgmt_t)
 
 sysnet_domtrans_ifconfig(ipsec_mgmt_t)
diff --git a/refpolicy/policy/modules/system/pcmcia.te b/refpolicy/policy/modules/system/pcmcia.te
index 9e7bbdb0..28ac24aa 100644
--- a/refpolicy/policy/modules/system/pcmcia.te
+++ b/refpolicy/policy/modules/system/pcmcia.te
@@ -123,6 +123,17 @@ optional_policy(`selinuxutils.te',`
 	seutil_sigchld_newrole(cardmgr_t)
 ')
 
+optional_policy(`sysnetwork.te',`
+	sysnet_domtrans_dhcpc(cardmgr_t)
+
+	sysnet_read_dhcpc_pid(cardmgr_t)
+	sysnet_kill_dhcpc(cardmgr_t)
+	sysnet_sigchld_dhcpc(cardmgr_t)
+	sysnet_signal_dhcpc(cardmgr_t)
+	sysnet_signull_dhcpc(cardmgr_t)
+	sysnet_sigstop_dhcpc(cardmgr_t)
+')
+
 optional_policy(`udev.te', `
 	udev_read_db(cardmgr_t)
 ')
diff --git a/refpolicy/policy/modules/system/raid.te b/refpolicy/policy/modules/system/raid.te
index 8d28d83d..a8a2f469 100644
--- a/refpolicy/policy/modules/system/raid.te
+++ b/refpolicy/policy/modules/system/raid.te
@@ -1,5 +1,5 @@
 
-policy_module(mdadm,1.0)
+policy_module(raid,1.0)
 
 ########################################
 #
diff --git a/refpolicy/policy/modules/system/sysnetwork.te b/refpolicy/policy/modules/system/sysnetwork.te
index 5dbd0f17..4086c6a4 100644
--- a/refpolicy/policy/modules/system/sysnetwork.te
+++ b/refpolicy/policy/modules/system/sysnetwork.te
@@ -209,18 +209,6 @@ optional_policy(`rhgb.te',`
 rhgb_domain(dhcpc_t)
 ')
 
-#this goes to pcmcia module
-optional_policy(`sysnetwork.te',`
-	sysnet_domtrans_dhcpc(cardmgr_t)
-
-	sysnet_read_dhcpc_pid(cardmgr_t)
-	sysnet_kill_dhcpc(cardmgr_t)
-	sysnet_sigchld_dhcpc(cardmgr_t)
-	sysnet_signal_dhcpc(cardmgr_t)
-	sysnet_signull_dhcpc(cardmgr_t)
-	sysnet_sigstop_dhcpc(cardmgr_t)
-')
-
 dontaudit dhcpc_t domain:dir getattr;
 ') dnl endif TODO