diff --git a/.cvsignore b/.cvsignore
index 981e94e..29a1efc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,5 @@ setroubleshoot-2.1.9.tar.gz
 setroubleshoot-2.1.10.tar.gz
 setroubleshoot-2.1.11.tar.gz
 setroubleshoot-2.1.12.tar.gz
+setroubleshoot-2.1.13.tar.gz
+setroubleshoot-2.1.14.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 07e2b92..53d9b86 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,13 +1,12 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.12
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
-Patch: setroubleshoot-2.1.12-guiredesign.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
@@ -17,12 +16,8 @@ Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
 Requires: gnome-python2-gtkhtml2
-Requires: dbus libnotify
-Requires: dbus-python
 Requires: python-bugzilla
 Requires: gnome-python2-gnomekeyring
-Requires: libxml2-python
-Requires: libselinux-python  >= 1.30.15-1
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database
@@ -30,6 +25,7 @@ Requires(postun): dbus
 Requires: notify-python
 %{?fc7:Requires: selinux-policy-base >= 2.6.4-45}
 %{?fc8:Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc11:Requires: selinux-policy-base >= 3.6.12-48}
 
 %if 0%{?fedora}
 BuildRequires: xdg-utils
@@ -76,6 +72,10 @@ to user preference. The same tools can be run on existing log files.
 %{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/run_cmd.py*
 %{_bindir}/seapplet
+%config %{_datadir}/PolicyKit/policy/org.fedoraproject.setroubleshootfixit.policy
+%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
+%{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
+
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
@@ -90,7 +90,6 @@ touch --no-create %{_datadir}/icons/hicolor
 
 %prep
 %setup -q
-%patch -p1 -b .guiredesign
 
 %build
 %configure
@@ -113,10 +112,13 @@ Requires: %{name}-plugins >= 2.0.4
 Requires: audit >= 1.2.6-3
 Requires: audit-libs-python >= 1.2.6-3
 Requires: pygobject2
-Requires: dbus-python 
+Requires: dbus libnotify
+Requires: dbus-python
 Requires: libxml2-python
 Requires: rpm-python
 Requires: gtk2 libnotify
+Requires: libselinux-python  >= 1.30.15-1
+Requires: policycoreutils-python 
 BuildRequires: intltool gettext python
 
 Requires(post):   /sbin/chkconfig
@@ -199,6 +201,13 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Jun 16 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.1-1
+- Update to upstream
+  * New Gui
+
+* Wed Jun 10 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.13-2
+- Fix handling of PATH with locatepwd
+
 * Mon Jun 8  2009 Thomas Liu <tliu@redhat.com> - 2.1.12-2
 - Redesign of GUI
 
diff --git a/sources b/sources
index 851fc87..4a37206 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bfbdaecc9bc5d1ad0859b7ea0a9cc54  setroubleshoot-2.1.12.tar.gz
+ba2296f3e5b74ce3eb5298251aa5eff3  setroubleshoot-2.1.14.tar.gz