diff --git a/avahi-enable-ipv6.patch b/avahi-enable-ipv6.patch
new file mode 100644
index 0000000..8d4602e
--- /dev/null
+++ b/avahi-enable-ipv6.patch
@@ -0,0 +1,13 @@
+Index: avahi-0.6.31/avahi-daemon/avahi-daemon.conf
+===================================================================
+--- avahi-0.6.31.orig/avahi-daemon/avahi-daemon.conf
++++ avahi-0.6.31/avahi-daemon/avahi-daemon.conf
+@@ -23,7 +23,7 @@
+ #domain-name=local
+ #browse-domains=0pointer.de, zeroconf.org
+ use-ipv4=yes
+-use-ipv6=no
++use-ipv6=yes
+ #allow-interfaces=eth0
+ #deny-interfaces=eth1
+ #check-response-ttl=no
diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index ee0d3ee..1ec3f7f 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -74,6 +74,8 @@ Patch11:        avahi-gtk_box_new.patch
 Patch12:        avahi-gir-fixup.patch
 # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
 Patch13:        avahi-fix-mkdir.diff
+#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
+Patch14:        avahi-enable-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python
 BuildRequires:  fdupes
@@ -723,6 +725,7 @@ translation-update-upstream
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
diff --git a/avahi-mono.spec b/avahi-mono.spec
index 7a9956b..e4de7ae 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -74,6 +74,8 @@ Patch11:        avahi-gtk_box_new.patch
 Patch12:        avahi-gir-fixup.patch
 # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
 Patch13:        avahi-fix-mkdir.diff
+#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
+Patch14:        avahi-enable-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python
 BuildRequires:  fdupes
@@ -722,6 +724,7 @@ translation-update-upstream
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index a6bfd7c..43107e5 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -74,6 +74,8 @@ Patch11:        avahi-gtk_box_new.patch
 Patch12:        avahi-gir-fixup.patch
 # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
 Patch13:        avahi-fix-mkdir.diff
+#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
+Patch14:        avahi-enable-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python
 BuildRequires:  fdupes
@@ -725,6 +727,7 @@ translation-update-upstream
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
diff --git a/avahi.changes b/avahi.changes
index 2f7bcc8..ca94885 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 11 14:40:22 CEST 2012 - vuntz@opensuse.org
+
+- Add avahi-enable-ipv6.patch: enable IPv6 by default. Fix
+  bnc#710230.
+
 -------------------------------------------------------------------
 Sun Jul  1 20:38:09 UTC 2012 - coolo@suse.com
 
diff --git a/avahi.spec b/avahi.spec
index 12149e2..fc98428 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -76,6 +76,8 @@ Patch11:        avahi-gtk_box_new.patch
 Patch12:        avahi-gir-fixup.patch
 # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
 Patch13:        avahi-fix-mkdir.diff
+#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
+Patch14:        avahi-enable-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python
 BuildRequires:  fdupes
@@ -725,6 +727,7 @@ translation-update-upstream
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.