diff -u serf-1.0.0/debian/changelog serf-1.0.0/debian/changelog
--- serf-1.0.0/debian/changelog
+++ serf-1.0.0/debian/changelog
@@ -1,3 +1,11 @@
+serf (1.0.0-2) experimental; urgency=low
+
+  * patches/bind_address_family: New patch from Anders Kaseorg to replace
+    patches/ip6-localhost.  We'll see if it addresses #632573.
+  * Policy 3.9.2 (no changes).
+
+ -- Peter Samuelson <peter@p12n.org>  Wed, 17 Aug 2011 17:12:21 -0500
+
 serf (1.0.0-1) experimental; urgency=low
 
   * New upstream release.
diff -u serf-1.0.0/debian/control serf-1.0.0/debian/control
--- serf-1.0.0/debian/control
+++ serf-1.0.0/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Peter Samuelson <peter@p12n.org>
 Build-Depends: dpkg-dev (>= 1.16.0~), debhelper,
     quilt, autoconf, autotools-dev, libapr1-dev, libaprutil1-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/serf/
 
 Package: libserf1
diff -u serf-1.0.0/debian/patches/series serf-1.0.0/debian/patches/series
--- serf-1.0.0/debian/patches/series
+++ serf-1.0.0/debian/patches/series
@@ -2 +2 @@
-ip6-localhost
+bind_address_family
only in patch2:
unchanged:
--- serf-1.0.0.orig/debian/patches/bind_address_family
+++ serf-1.0.0/debian/patches/bind_address_family
@@ -0,0 +1,19 @@
+Pass an explicit address family into apr_socket_create.  Apparently
+fixes some IPv4/IPv6 mixup in the tests.  See Bug #632573.
+
+Patch is from Anders Kaseorg <andersk@mit.edu>.
+
+--- a/test/server/test_server.c
++++ b/test/server/test_server.c
+@@ -323,9 +323,9 @@ apr_status_t test_start_server(serv_ctx_
+ 
+     /* create server socket */
+ #if APR_VERSION_AT_LEAST(1, 0, 0)
+-    status = apr_socket_create(&serv_sock, APR_UNSPEC, SOCK_STREAM, 0, pool);
++    status = apr_socket_create(&serv_sock, address->family, SOCK_STREAM, 0, pool);
+ #else
+-    status = apr_socket_create(&serv_sock, APR_UNSPEC, SOCK_STREAM, pool);
++    status = apr_socket_create(&serv_sock, address->family, SOCK_STREAM, pool);
+ #endif
+ 
+     if (status != APR_SUCCESS)