diff --git a/policy-20071130.patch b/policy-20071130.patch
index fc895d64..204579e5 100644
--- a/policy-20071130.patch
+++ b/policy-20071130.patch
@@ -4969,7 +4969,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.2.5/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.2.5/policy/modules/services/apcupsd.if	2007-12-19 05:38:09.000000000 -0500
++++ serefpolicy-3.2.5/policy/modules/services/apcupsd.if	2007-12-31 16:41:36.000000000 -0500
 @@ -90,10 +90,29 @@
  ## </summary>
  ## </param>
@@ -7895,7 +7895,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.2.5/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.2.5/policy/modules/services/mysql.te	2007-12-31 06:59:38.000000000 -0500
++++ serefpolicy-3.2.5/policy/modules/services/mysql.te	2007-12-31 16:45:48.000000000 -0500
 @@ -1,4 +1,3 @@
 -
  policy_module(mysql,1.6.0)
@@ -7917,7 +7917,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
  allow mysqld_t self:process { setsched getsched setrlimit signal_perms rlimitinh };
 -allow mysqld_t self:fifo_file { read write };
 +allow mysqld_t self:fifo_file rw_fifo_file_perms;
-+allow mysqld_t self:shm create_shm_file_perms;
++allow mysqld_t self:shm create_shm_perms;
  allow mysqld_t self:unix_stream_socket create_stream_socket_perms;
  allow mysqld_t self:tcp_socket create_stream_socket_perms;
  allow mysqld_t self:udp_socket create_socket_perms;
@@ -13092,7 +13092,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.2.5/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.2.5/policy/modules/system/logging.te	2007-12-25 07:00:24.000000000 -0500
++++ serefpolicy-3.2.5/policy/modules/system/logging.te	2007-12-31 16:41:38.000000000 -0500
 @@ -61,6 +61,12 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 3e8d6780..44830cd6 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.2.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -295,8 +295,8 @@ semodule -s targeted -r moilscanner 2>/dev/null
 
 if [ $1 = 1 ]; then
 semanage user -a -P unconfined -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u 
-semanage login -m -s "unconfined_u" __default__ 2> /dev/null
-semanage login -m -s "system_u" root 2> /dev/null
+semanage login -m -s "unconfined_u" -r s0-s0:c0.c1023 __default__ 2> /dev/null
+semanage login -m -s "unconfined_u" -r s0-s0:c0.c1023 root 2> /dev/null
 semanage user -a -P guest -R guest_r guest_u
 semanage user -a -P xguest -R xguest_r xguest_u 
 restorecon -R /root /var/log /var/run 2> /dev/null
@@ -386,6 +386,11 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 31 2007 Dan Walsh <dwalsh@redhat.com> 3.2.5-7
+- Fix munin log,
+- Eliminate duplicate mozilla file context
+- fix wpa_supplicant spec
+
 * Mon Dec 24 2007 Dan Walsh <dwalsh@redhat.com> 3.2.5-6
 - Fix role transition from unconfined_r to system_r when running rpm
 - Allow unconfined_domains to communicate with user dbus instances