diff --git a/.cvsignore b/.cvsignore
index 625ef91..d3bee72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 seahorse-1.0.1.tar.gz
+seahorse-2.21.3.tar.gz
diff --git a/seahorse.spec b/seahorse.spec
index 2482c12..a540bea 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,13 +1,13 @@
 Name: 		seahorse
-Version: 	1.0.1
-Release:        9%{?dist}
+Version: 	2.21.3
+Release:        1%{?dist}
 Summary:	GNOME2 interface for gnupg
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://seahorse.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/1.0/%{name}-%{version}.tar.gz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.21/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -27,6 +27,9 @@ BuildRequires:  perl-XML-Parser
 BuildRequires:  openssh-clients
 BuildRequires:  gnome-doc-utils >= 0.3.2
 BuildRequires:  gnome-keyring-devel
+BuildRequires:  avahi-devel
+BuildRequires:  avahi-glib-devel
+BuildRequires:  chrpath
 Requires(post): desktop-file-utils
 Requires(post): GConf2
 Requires(post): scrollkeeper
@@ -48,7 +51,8 @@ sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefil
 %build
 %configure --disable-scrollkeeper
 make %{?_smp_mflags}
-
+# cleanup permissions for files that go into debuginfo
+find . -type f -name "*.c" -exec chmod a-x {} ';'
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -62,7 +66,14 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -rf ${RPM_BUILD_ROOT}/usr/include/libcryptui
 rm -rf ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/cryptui-0.0.pc
 rm -rf ${RPM_BUILD_ROOT}/usr/lib64/pkgconfig/cryptui-0.0.pc
+rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libcryptui.so
 
+# Nuke rpath
+for f in %{_bindir}/seahorse{,-preferences,-tool,-daemon,-agent} \
+         %{_libdir}/seahorse/seahorse-{ssh-askpass,applet} \
+         %{_libdir}/gedit-2/plugins/libseahorse-pgp.so; do
+	 chrpath --delete $RPM_BUILD_ROOT${f}
+done
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
@@ -128,7 +139,6 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/control-center-2.0/capplets/*.desktop
 %dir %{_datadir}/gnome/help/%{name}
 %{_datadir}/gnome/help/%{name}/*
 %{_datadir}/gnome/help/%{name}-applet/*
@@ -146,12 +156,17 @@ fi
 %{_libdir}/libcryptui*
 %{_libdir}/gedit-2/plugins/*
 %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so
-%{_sysconfdir}/gconf/schemas/*
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server
 %{_datadir}/dbus-1/services/org.gnome.seahorse.service
 
 
 %changelog
+* Sat Dec  1 2007 Matt Domsch <mdomsch at fedoraproject.org> 2.21.3-1
+- upgrade to 2.21.3
+- enable avahi integration
+- rpmlint cleanups: remove rpath, unneeded .so, tag config files
+
 * Wed Aug 22 2007 Seth Vidal <skvidal at fedoraproject.org>
 - fix license tag
 - rebuild for fun!
diff --git a/sources b/sources
index bdf8588..11ab59f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 50510a1fc0d5875788c070a26f55f8dd  seahorse-1.0.1.tar.gz
+005a968d5dc1c727abb34f92bd098561  seahorse-2.21.3.tar.gz