diff --git a/policy-20070703.patch b/policy-20070703.patch
index 25cb8ec..7328627 100644
--- a/policy-20070703.patch
+++ b/policy-20070703.patch
@@ -5326,7 +5326,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.0.8/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2008-06-12 23:37:56.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/domain.te	2008-06-12 23:37:59.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/domain.te	2008-09-25 15:20:35.000000000 -0400
 @@ -6,6 +6,22 @@
  # Declarations
  #
@@ -5374,7 +5374,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
  
  tunable_policy(`global_ssp',`
  	# enable reading of urandom for all domains:
-@@ -129,8 +152,46 @@
+@@ -129,8 +152,50 @@
  
  # For /proc/pid
  allow unconfined_domain_type domain:dir r_dir_perms;
@@ -5422,6 +5422,10 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +	rhgb_dontaudit_use_ptys(domain)
 +')
 +
++ifdef(`hide_broken_symptoms',`
++        dbus_dontaudit_system_bus_rw_tcp_sockets(domain)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2008-06-12 23:37:56.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2008-06-12 23:37:59.000000000 -0400
@@ -9693,7 +9697,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2008-07-02 17:15:03.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2008-09-25 15:21:28.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -9864,7 +9868,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  	allow $1 dbusd_etc_t:file read_file_perms;
  ')
  
-@@ -346,3 +430,57 @@
+@@ -346,3 +430,75 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -9922,6 +9926,24 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +	dbus_connect_system_bus($1)
 +')
 +
++########################################
++## <summary>
++##	Dontaudit Read, and write system dbus TCP sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dbus_dontaudit_system_bus_rw_tcp_sockets',`
++	gen_require(`
++		type system_dbusd_t;
++	')
++
++	allow $1 system_dbusd_t:tcp_socket { read write };
++	allow $1 system_dbusd_t:fd use;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-06-12 23:37:57.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2008-09-23 15:30:42.000000000 -0400
@@ -12883,7 +12905,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-06-12 23:37:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-09-23 16:05:47.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2008-09-25 15:15:35.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(networkmanager,1.7.1)
@@ -12974,8 +12996,11 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  libs_use_ld_so(NetworkManager_t)
  libs_use_shared_libs(NetworkManager_t)
  
-@@ -109,10 +132,14 @@
+@@ -107,12 +130,17 @@
+ # in /etc created by NetworkManager will be labelled net_conf_t.
+ sysnet_manage_config(NetworkManager_t)
  sysnet_etc_filetrans_config(NetworkManager_t)
++sysnet_read_dhcp_config(NetworkManager_t)
  
  userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
 -userdom_dontaudit_search_sysadm_home_dirs(NetworkManager_t)
@@ -12990,7 +13015,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  
  optional_policy(`
  	bind_domtrans(NetworkManager_t)
-@@ -129,28 +156,26 @@
+@@ -129,28 +157,26 @@
  ')
  
  optional_policy(`
@@ -13029,7 +13054,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  ')
  
  optional_policy(`
-@@ -159,9 +184,17 @@
+@@ -159,22 +185,25 @@
  ')
  
  optional_policy(`
@@ -13039,15 +13064,27 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  	ppp_signal(NetworkManager_t)
 +	ppp_signull(NetworkManager_t)
 +	ppp_read_config(NetworkManager_t)
-+')
-+
-+optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	seutil_sigchld_newrole(NetworkManager_t)
 +	rpm_exec(NetworkManager_t)
 +	rpm_read_db(NetworkManager_t)
 +	rpm_dontaudit_manage_db(NetworkManager_t)
  ')
  
  optional_policy(`
+-	udev_read_db(NetworkManager_t)
++	seutil_sigchld_newrole(NetworkManager_t)
+ ')
+ 
+ optional_policy(`
+-	# Read gnome-keyring
+-	unconfined_read_home_content_files(NetworkManager_t)
++	udev_read_db(NetworkManager_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.8/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2008-06-12 23:37:57.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/nis.fc	2008-06-12 23:37:58.000000000 -0400
diff --git a/selinux-policy.spec b/selinux-policy.spec
index b9f92af..476edf8 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 116%{?dist}
+Release: 117%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -381,6 +381,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 25 2008 Dan Walsh <dwalsh@redhat.com> 3.0.8-117
+- Update networkmanager to latest upstream version
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh@redhat.com> 3.0.8-116
 - add mimedefang to spamd