diff --git a/policy-20090521.patch b/policy-20090521.patch
index 0c2d2ce..ce0e348 100644
--- a/policy-20090521.patch
+++ b/policy-20090521.patch
@@ -2818,8 +2818,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/gpsd\.sock              -s      gen_context(system_u:object_r:gpsd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.6.12/policy/modules/services/gpsd.te
 --- nsaserefpolicy/policy/modules/services/gpsd.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/gpsd.te	2009-06-25 10:24:43.000000000 +0200
-@@ -8,11 +9,17 @@
++++ serefpolicy-3.6.12/policy/modules/services/gpsd.te	2009-08-20 14:46:39.000000000 +0200
+@@ -8,17 +9,23 @@
  type gpsd_t;
  type gpsd_exec_t;
  application_domain(gpsd_t, gpsd_exec_t)
@@ -2838,6 +2838,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # gpsd local policy
+ #
+ 
+-allow gpsd_t self:capability { setuid sys_nice setgid fowner };
++allow gpsd_t self:capability { setuid sys_nice setgid fowner fsetid };
+ allow gpsd_t self:process setsched;
+ allow gpsd_t self:shm create_shm_perms;
+ allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -28,6 +35,15 @@
  manage_files_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t)
  fs_tmpfs_filetrans(gpsd_t, gpsd_tmpfs_t, { dir file })
@@ -3357,6 +3364,42 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +auth_use_nsswitch(nslcd_t)
 +
 +logging_send_syslog_msg(nslcd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.6.12/policy/modules/services/nx.fc
+--- nsaserefpolicy/policy/modules/services/nx.fc	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/nx.fc	2009-08-20 15:35:42.000000000 +0200
+@@ -5,3 +5,6 @@
+ /opt/NX/var(/.*)?			gen_context(system_u:object_r:nx_server_var_run_t,s0)
+ 
+ /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
++
++/var/lib/nxserver/home/.ssh(/.*)? 	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.12/policy/modules/services/nx.if
+--- nsaserefpolicy/policy/modules/services/nx.if	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/nx.if	2009-08-20 15:36:36.000000000 +0200
+@@ -17,3 +17,22 @@
+ 
+ 	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
+ ')
++
++#######################################
++## <summary>
++## Read nx home directory content
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nx_read_home_files',`
++	gen_require(`
++		type nx_server_home_ssh_t;
++	')
++
++	read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.12/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-04-07 21:54:45.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/openvpn.te	2009-08-20 09:42:28.000000000 +0200
@@ -4204,8 +4247,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.12/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-06-29 22:52:07.000000000 +0200
-@@ -347,6 +347,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-08-20 15:37:17.000000000 +0200
+@@ -347,10 +347,18 @@
  ')
  
  optional_policy(`
@@ -4216,6 +4259,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	inetd_tcp_service_domain(sshd_t, sshd_exec_t)
  ')
  
+ optional_policy(`
++	nx_read_home_files(sshd_t)
++')
++
++optional_policy(`
+ 	rpm_use_script_fds(sshd_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.12/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/uucp.te	2009-07-07 09:47:39.000000000 +0200
@@ -5393,8 +5444,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-13 09:03:28.000000000 +0200
-@@ -518,6 +518,8 @@
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-20 15:20:32.000000000 +0200
+@@ -443,6 +443,9 @@
+ 	dev_rw_usbfs($1)
+ 	dev_rw_generic_usb_dev($1)
+ 
++	dev_read_video_dev($1)
++	dev_write_video_dev($1)
++
+ 	miscfiles_dontaudit_write_fonts($1)
+ 
+ 	optional_policy(`
+@@ -518,6 +521,8 @@
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
  
@@ -5403,7 +5464,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	allow $1_usertype unpriv_userdomain:fd use;
  
  	kernel_read_system_state($1_usertype)
-@@ -627,12 +629,6 @@
+@@ -627,12 +632,6 @@
  		')
  
  		optional_policy(`
@@ -5416,7 +5477,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  			evolution_dbus_chat($1_usertype)
  			evolution_alarm_dbus_chat($1_usertype)
  	')
-@@ -968,6 +964,21 @@
+@@ -968,6 +967,21 @@
  	')
  
  		optional_policy(`
@@ -5438,7 +5499,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		gnome_manage_config($1_usertype)
  		gnome_manage_gconf_home_files($1_usertype)
  		gnome_read_gconf_config($1_usertype)
-@@ -1457,6 +1468,7 @@
+@@ -1457,6 +1471,7 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -5446,7 +5507,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	files_search_home($1)
  ')
  
-@@ -1880,7 +1892,7 @@
+@@ -1880,7 +1895,7 @@
  		type user_home_t;
  	')
  
@@ -5455,7 +5516,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -3317,10 +3329,6 @@
+@@ -3317,10 +3332,6 @@
    seutil_run_newrole($1_t, $1_r)
  
    optional_policy(`