diff -u seahorse-2.22.0/debian/changelog seahorse-2.22.0/debian/changelog
--- seahorse-2.22.0/debian/changelog
+++ seahorse-2.22.0/debian/changelog
@@ -1,3 +1,10 @@
+seahorse (2.22.0-0ubuntu2) hardy; urgency=low
+
+  * cleaning up debian/patches/11_ubuntu_keyserver.patch by Andrew
+    Starr-Bochicchio (LP: #86796)
+
+ -- Brian Murray <brian@ubuntu.com>  Tue, 18 Mar 2008 10:11:25 -0700
+
 seahorse (2.22.0-0ubuntu1) hardy; urgency=low
 
   * New upstream release (LP: #200362)
diff -u seahorse-2.22.0/debian/control seahorse-2.22.0/debian/control
--- seahorse-2.22.0/debian/control
+++ seahorse-2.22.0/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@ubuntu.com>, Josselin Mouette <joss@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
                quilt,
diff -u seahorse-2.22.0/debian/patches/11_ubuntu_keyserver.patch seahorse-2.22.0/debian/patches/11_ubuntu_keyserver.patch
--- seahorse-2.22.0/debian/patches/11_ubuntu_keyserver.patch
+++ seahorse-2.22.0/debian/patches/11_ubuntu_keyserver.patch
@@ -1,16 +1,13 @@
---- seahorse-2.21.91.orig/debian/patches/11_ubuntu_keyserver.patch
-+++ seahorse-2.21.91/debian/patches/11_ubuntu_keyserver.patch
-@@ -0,0 +1,13 @@
-+Index: seahorse-2.21.91/data/seahorse.schemas.in
-+===================================================================
-+--- seahorse-2.21.91.orig/data/seahorse.schemas.in	2008-02-09 00:41:47.000000000 -0500
-++++ seahorse-2.21.91/data/seahorse.schemas.in	2008-02-09 00:42:37.000000000 -0500
-+@@ -252,7 +252,7 @@
-+ 			<owner>seahorse</owner>
-+ 			<type>list</type>
-+ 			<list_type>string</list_type>
-+-			<default>[hkp://pgp.mit.edu:11371,ldap://keyserver.pgp.com]</default>
-++			<default>[hkp://keyserver.ubuntu.com:11371,hkp://pgp.mit.edu:11371,ldap://keyserver.pgp.com]</default>
-+ 			<locale name="C">
-+ 				<short>PGP Key servers</short>
-+ 				<long>A list of key server URIs to search for remote PGP keys.
+Index: seahorse-2.21.91/data/seahorse.schemas.in
+===================================================================
+--- seahorse-2.21.91.orig/data/seahorse.schemas.in	2008-02-09 00:41:47.000000000 -0500
++++ seahorse-2.21.91/data/seahorse.schemas.in	2008-02-09 00:42:37.000000000 -0500
+@@ -252,7 +252,7 @@
+ 			<owner>seahorse</owner>
+ 			<type>list</type>
+ 			<list_type>string</list_type>
+-			<default>[hkp://pgp.mit.edu:11371,ldap://keyserver.pgp.com]</default>
++			<default>[hkp://keyserver.ubuntu.com:11371,hkp://pgp.mit.edu:11371,ldap://keyserver.pgp.com]</default>
+ 			<locale name="C">
+ 				<short>PGP Key servers</short>
+ 				<long>A list of key server URIs to search for remote PGP keys.