diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index 24782d8..0790960 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.3/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.7/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/booleansPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/booleansPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,199 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -201,9 +201,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.3/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.7/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/fcontextPage.py	2007-02-22 12:33:40.000000000 -0500
++++ policycoreutils-2.0.7/gui/fcontextPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,172 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -377,9 +377,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
 +        self.store.set_value(iter, 0, fspec)
 +        self.store.set_value(iter, 2, ftype)
 +        self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.3/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.7/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/loginsPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/loginsPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,161 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -542,9 +542,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.3/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.7/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/Makefile	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/Makefile	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,30 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -576,9 +576,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.3/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.7/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/mappingsPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/mappingsPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.3/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.7/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/modulesPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/modulesPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,161 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -799,9 +799,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.3/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.7/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/portsPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/portsPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,214 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -1017,9 +1017,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.3/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.7/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/selinux.tbl	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/selinux.tbl	2007-03-12 20:35:38.000000000 -0400
 @@ -0,0 +1,265 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -1046,7 +1046,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco
 +allow_polyinstantiation _("Polyinstatiation") _("Enable polyinstantiated directory support.")
 +allow_ptrace _("Compatibility") _("Allow sysadm_t to debug or ptrace applications)
 +allow_rsync_anon_write _("rsync") _("Allow rsync to write files in directories labeled public_content_rw_t")
-+allow_saslauthd_read_shadow _("sasl authentication server") _("Allow sasl authentication server to read /etc/shadow")
 +allow_smbd_anon_write _("Samba") _("Allow Samba to write files in directories labeled public_content_rw_t")
 +allow_ssh_keysign _("SSH") _("Allow ssh to run ssh-keysign")
 +allow_unconfined_execmem_dyntrans _("Memory Protection") _("Allow unconfined to dyntrans to unconfined_execmem")
@@ -1214,7 +1213,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco
 +run_ssh_inetd _("SSH") _("Allow ssh to run from inetd instead of as a daemon")
 +samba_enable_home_dirs _("Samba") _("Allow Samba to share users home directories")
 +samba_share_nfs _("Samba") _("Allow Samba to share nfs directories")
-+saslauthd_disable_trans _("sasl authentications server") _("Disable SELinux protection for saslauthd daemon")
++allow_saslauthd_read_shadow _("SASL authentication server") _("Allow sasl authentication server to read /etc/shadow")
++saslauthd_disable_trans _("SASL authentication server") _("Disable SELinux protection for saslauthd daemon")
 +scannerdaemon_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for scannerdaemon daemon")
 +secure_mode  _("Admin") _("Do not allow transition to sysadm_t, sudo and su effected")
 +secure_mode_insmod  _("Admin") _("Do not allow any processes to load kernel modules")
@@ -1286,9 +1286,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco
 +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon")
 +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon")
 +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon")
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.3/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.7/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/semanagePage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/semanagePage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,109 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -1399,9 +1399,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.3/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.7/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/statusPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/statusPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,213 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -1616,9 +1616,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.3/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.7/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/system-config-selinux.glade	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/system-config-selinux.glade	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,2803 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -4423,9 +4423,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.3/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.7/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/system-config-selinux.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/system-config-selinux.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,156 @@
 +#!/usr/bin/python
 +#
@@ -4583,9 +4583,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.3/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.7/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/translationsPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/translationsPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,109 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4696,9 +4696,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py 
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.3/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.7/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.3/gui/usersPage.py	2007-02-22 12:32:39.000000000 -0500
++++ policycoreutils-2.0.7/gui/usersPage.py	2007-03-01 17:37:41.000000000 -0500
 @@ -0,0 +1,155 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 7d597df..921db5f 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.6/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.4 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.7/Makefile
 --- nsapolicycoreutils/Makefile	2006-11-16 17:15:00.000000000 -0500
-+++ policycoreutils-2.0.6/Makefile	2007-02-27 11:30:03.000000000 -0500
++++ policycoreutils-2.0.7/Makefile	2007-03-01 17:37:41.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.6/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.4 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.7/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.6/restorecond/restorecond.c	2007-02-27 11:30:03.000000000 -0500
++++ policycoreutils-2.0.7/restorecond/restorecond.c	2007-03-01 17:37:41.000000000 -0500
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,9 +36,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po 
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.6/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.4 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.7/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-2.0.6/restorecond/restorecond.conf	2007-02-27 11:30:03.000000000 -0500
++++ policycoreutils-2.0.7/restorecond/restorecond.conf	2007-03-01 17:37:41.000000000 -0500
 @@ -1,7 +1,10 @@
  /etc/resolv.conf
 +/etc/localtime
@@ -50,9 +50,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po 
 +/etc/lvm/.cache
  ~/public_html
  ~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.6/scripts/chcat
+diff --exclude-from=exclude --exclude=sepolgen-1.0.4 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.7/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.6/scripts/chcat	2007-02-27 11:30:03.000000000 -0500
++++ policycoreutils-2.0.7/scripts/chcat	2007-03-01 17:37:41.000000000 -0500
 @@ -74,9 +74,11 @@
              if i not in cats:
                  cats.append(i)
@@ -84,9 +84,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po 
          if add_ind:
              cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
          else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.6/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.4 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.7/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.6/semanage/seobject.py	2007-02-27 11:30:03.000000000 -0500
++++ policycoreutils-2.0.7/semanage/seobject.py	2007-03-12 20:44:29.000000000 -0400
 @@ -209,6 +209,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -95,3 +95,19 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po 
                  
  class semanageRecords:
  	def __init__(self):
+@@ -1282,9 +1283,12 @@
+ 			raise ValueError(_("Could not list booleans"))
+ 
+ 		for boolean in self.blist:
+-			name = semanage_bool_get_name(boolean)
+-			value = semanage_bool_get_value(boolean)
+-			ddict[name] = value
++                       value = []
++                       name = semanage_bool_get_name(boolean)
++                       value[0] = semanage_bool_get_value(boolean)
++                       value[1] = selinux.security_get_boolean_pending(boolean)
++                       value[2] = selinux.security_get_boolean_active(boolean)
++                       ddict[name] = value
+ 
+ 		return ddict
+ 			
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 86f8f50..a6ed28a 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Mar 12 2007 Dan Walsh <dwalsh@redhat.com> 2.0.7-2
+- Fix gui
+
 * Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 2.0.7-1
 - Update to upstream
 	* Merged restorecond init script LSB compliance patch from Steve Grubb.