diff -u oidentd-2.0.8/debian/rules oidentd-2.0.8/debian/rules
--- oidentd-2.0.8/debian/rules
+++ oidentd-2.0.8/debian/rules
@@ -3,2 +3,3 @@
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug --enable-nat
diff -u oidentd-2.0.8/debian/changelog oidentd-2.0.8/debian/changelog
--- oidentd-2.0.8/debian/changelog
+++ oidentd-2.0.8/debian/changelog
@@ -1,3 +1,10 @@
+oidentd (2.0.8-4) unstable; urgency=low
+
+  * Bind to ipv6-socket by default as well (Closes: #533604)
+    Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
+
+ -- Stefan Bauer <stefan.bauer@cubewerk.de>  Mon, 01 Mar 2010 20:27:22 +0100
+
 oidentd (2.0.8-3) unstable; urgency=low
 
   * Migrating logcheck ignore database from logcheck-database package to
only in patch2:
unchanged:
--- oidentd-2.0.8.orig/debian/README.source
+++ oidentd-2.0.8/debian/README.source
@@ -0,0 +1,6 @@
+Building oidentd for Debian
+--------------------------------
+
+The oidentd source package uses cdbs to apply and remove its patches.
+Please refer to /usr/share/cdbs/ for information about how to
+use cdbs for source packages.
only in patch2:
unchanged:
--- oidentd-2.0.8.orig/debian/patches/bind-to-ipv6-too.patch
+++ oidentd-2.0.8/debian/patches/bind-to-ipv6-too.patch
@@ -0,0 +1,17 @@
+Patch to bind to ipv6 socket as well
+Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
+--- oidentd-2.0.8//src/oidentd_inet_util.c	2006-05-22 02:31:19.000000000 +0200
++++ oidentd-2.0.8.new//src/oidentd_inet_util.c	2010-03-01 20:26:11.000000000 +0100
+@@ -60,6 +60,12 @@
+ #ifdef WANT_IPV6
+ 		case AF_INET6:
+ 			SIN6(ai->ai_addr)->sin6_port = listen_port;
++
++			if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
++							sizeof(one)) != 0) {
++				debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
++				return (-1);
++			}
+ 			break;
+ #endif
+