diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index ff981b7..f349caf 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -3244,8 +3244,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
 +    
 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.7/gui/statusPage.py	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,219 @@
++++ policycoreutils-2.0.7/gui/statusPage.py	2007-03-30 12:14:46.000000000 -0400
+@@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -3331,6 +3331,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy
 +                self.currentOptionMenu.set_sensitive(True)
 +        else:
 +                self.currentOptionMenu.append_text(_("Disabled"))
++                self.currentOptionMenu.set_active(0)
 +                self.currentOptionMenu.set_sensitive(False)
 +
 +
@@ -6356,8 +6357,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +</glade-interface>
 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.7/gui/system-config-selinux.py	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,167 @@
++++ policycoreutils-2.0.7/gui/system-config-selinux.py	2007-03-30 12:14:36.000000000 -0400
+@@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -6397,6 +6398,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +import modulesPage
 +import fcontextPage
 +import translationsPage
++import selinux
 +##
 +## I18N
 +## 
@@ -6436,13 +6438,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
 +        xml.signal_connect("on_add_clicked", self.add)
 +        xml.signal_connect("on_properties_clicked", self.properties)
 +        self.add_page(statusPage.statusPage(xml))
-+        self.add_page(booleansPage.booleansPage(xml))
-+        self.add_page(fcontextPage.fcontextPage(xml))
-+        self.add_page(loginsPage.loginsPage(xml))
-+        self.add_page(usersPage.usersPage(xml))
-+        self.add_page(translationsPage.translationsPage(xml))
-+        self.add_page(portsPage.portsPage(xml))
-+        self.add_page(modulesPage.modulesPage(xml)) # modules
++        if selinux.is_selinux_enabled() > 0:
++            self.add_page(booleansPage.booleansPage(xml))
++            self.add_page(fcontextPage.fcontextPage(xml))
++            self.add_page(loginsPage.loginsPage(xml))
++            self.add_page(usersPage.usersPage(xml))
++            self.add_page(translationsPage.translationsPage(xml))
++            self.add_page(portsPage.portsPage(xml))
++            self.add_page(modulesPage.modulesPage(xml)) # modules
 +
 +        xml.signal_connect("on_quit_activate", self.destroy)
 +        xml.signal_connect("on_policy_activate", self.policy)
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 4ff277c..4624d7f 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Fri Mar 30 2007 Dan Walsh <dwalsh@redhat.com> 2.0.7-8
+- system-config-selinux should be able to run on a disabled system,
+- at least enough to get it enabled.
+
 * Thu Mar 29 2007 Dan Walsh <dwalsh@redhat.com> 2.0.7-7
 - Many fixes to polgengui