diff --git a/setools.spec b/setools.spec
index a879b3d..1c0502d 100644
--- a/setools.spec
+++ b/setools.spec
@@ -1,10 +1,10 @@
 Summary: SELinux tools for managing policy
 Name: setools
-Version: 1.5.1
-Release: 6
+Version: 2.0.0
+Release: 1
 License: GPL
 Group: System Environment/Base
-Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tgz
+Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
 Source1: setools.pam
 Source2: apol.console
 Source3: seuserx.console
@@ -12,6 +12,8 @@ Source4: seaudit.console
 Source5: apol.desktop
 Source6: seuserx.desktop
 Source7: seaudit.desktop
+Source8: sediffx.console
+Source9: sediffx.desktop
 
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -21,9 +23,6 @@ BuildRequires: libselinux-devel, libxml2-devel
 BuildPrereq: bison, flex, pkgconfig
 
 Patch0: setools-rhat.patch
-Patch1: setools-1.5.1-malloc.patch
-Patch2: setools-1.5.1-badtcl.patch
-Obsoletes: setools-devel
 
 %description
 Security-enhanced Linux is a patch of the Linux kernel and a number of
@@ -88,9 +87,7 @@ tools.
 %prep
 %setup -q
 %patch0 -p1 -b .rhat
-%patch1 -p1 -b .malloc
-%patch2 -p1 -b .badtcl
-
+	
 %build
 make LIBDIR=%{_libdir} all 
 
@@ -115,9 +112,11 @@ install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
 install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
 install -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seuserx
 install -D %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
+install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
 install -D %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
 install -D %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/applications/seuserx.desktop
 install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
+install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 cd $RPM_BUILD_ROOT/%_bindir/
 ln -sf consolehelper apol 
 ln -sf consolehelper seuserx
@@ -134,6 +133,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %_sbindir/apol
 %_bindir/seuserx
 %_sbindir/seuserx
+%_bindir/sediff
+%_sbindir/sediffx
 %_bindir/awish
 %_bindir/seaudit
 %_sbindir/seaudit
@@ -141,12 +142,26 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/applications/apol.desktop
 %{_datadir}/applications/seuserx.desktop
 %{_datadir}/applications/seaudit.desktop
+%{_datadir}/applications/sediffx.desktop
 %config %{_sysconfdir}/pam.d/apol
 %config %{_sysconfdir}/pam.d/seuserx
 %config %{_sysconfdir}/pam.d/seaudit
 %config %{_sysconfdir}/security/console.apps/apol
 %config %{_sysconfdir}/security/console.apps/seuserx
 %config %{_sysconfdir}/security/console.apps/seaudit
+%config %{_sysconfdir}/security/console.apps/sediffx
+
+%package devel
+Summary: Development environment for SETools
+Group: System Environment/Base
+Requires: %name
+
+%description devel
+Headers, static libraries and API docs for SETools.
+
+%files devel
+/usr/include/setools
+/usr/lib
 
 %files
 %defattr(-,root,root)
@@ -163,6 +178,9 @@ rm -rf ${RPM_BUILD_ROOT}
 /usr/share/doc/setools-%{version}/*
 
 %changelog
+* Tue Mar 2 2005 Dan Walsh <dwalsh@redhat.com> 2.0.0-6
+- Update to latest from tresys
+
 * Mon Nov 29 2004 Dan Walsh <dwalsh@redhat.com> 1.5.1-6
 - add FALLBACK=true to /etc/security/console.apps/apol