diff --git a/0005-core-only-set-IPv6-hop_limit-for-values-greater-than.patch b/0005-core-only-set-IPv6-hop_limit-for-values-greater-than.patch
new file mode 100644
index 0000000..0762d3a
--- /dev/null
+++ b/0005-core-only-set-IPv6-hop_limit-for-values-greater-than.patch
@@ -0,0 +1,31 @@
+From 6a79acb03abc3406b3889738f8003e5f385af1eb Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 15 Sep 2014 11:35:53 +0200
+Subject: [PATCH] core: only set IPv6 hop_limit for values greater than zero
+
+A "Cur Hop Limit" field value of 0 in a router advertisement means
+"unspecified by this router" and should not be set in the kernel.
+
+(cherry picked from commit c668297257aef17f921518f6a7efac2ede2af76a)
+---
+ src/devices/nm-device.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
+index 291f03f..3d8baf8 100644
+--- a/src/devices/nm-device.c
++++ b/src/devices/nm-device.c
+@@ -3616,7 +3616,9 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, NMDevice *device
+ 		}
+ 	}
+ 
+-	if (changed & NM_RDISC_CONFIG_HOP_LIMIT) {
++	/* hop_limit == 0 is a special value "unspecified", so do not touch
++	 * in this case */
++	if (changed & NM_RDISC_CONFIG_HOP_LIMIT && rdisc->hop_limit > 0) {
+ 		char val[16];
+ 
+ 		g_snprintf (val, sizeof (val), "%d", rdisc->hop_limit);
+-- 
+1.9.3
+
diff --git a/NetworkManager.spec b/NetworkManager.spec
index a50b8b5..8962ae0 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -13,7 +13,7 @@
 %define snapshot .git20140704
 %define git_sha 6eb82acd
 %define realversion 0.9.10.0
-%define release_version 10
+%define release_version 11
 %define epoch_version 1
 
 %define obsoletes_nmver 1:0.9.9.95-1
@@ -86,6 +86,7 @@ Patch1: 0001-policy-allow-non-local-admin-sessions-to-control-the.patch
 Patch2: 0002-bluez-split-out-errors.patch
 Patch3: 0003-bluez-track-adapter-address-in-NMBluezDevice.patch
 Patch4: 0004-bluez-re-add-DUN-support-for-Bluez5.patch
+Patch5: 0005-core-only-set-IPv6-hop_limit-for-values-greater-than.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -328,6 +329,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %patch2 -p1 -b .bluez-split-out-errors.orig
 %patch3 -p1 -b .bluez-track-adapter-address-in-NMBluezDevice.orig
 %patch4 -p1 -b .bluez-re-add-DUN-support-for-Bluez5.orig
+%patch5 -p1 -b .bluez-re-add-DUN-support-for-Bluez5.orig
 
 %build
 
@@ -599,6 +601,9 @@ fi
 %endif
 
 %changelog
+* Wed Oct 29 2014 Lubomir Rintel <lkundrak@v3.sk> 1:0.9.10.0-11.git20140704
+- Fix IPv6 next hop default setting
+
 * Fri Oct 24 2014 Lubomir Rintel <lkundrak@v3.sk> 1:0.9.10.0-10.git20140704
 - Avoid unowned /etc/NetworkManager in config-connectivity-fedora