diff --git a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
index 5dc6fd6..d8e8028 100644
--- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
+++ b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
@@ -1,14 +1,13 @@
-From 00d4447395725abaa651e12ed40095081e04011e Mon Sep 17 00:00:00 2001
+From c98397c8a29e2abc837f20c7f3f629feb277a5e0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 13 Sep 2015 13:22:01 -0700
-Subject: [PATCH 1/3] Detect backtrace() API availability before using it
+Subject: [PATCH 2/4] Detect backtrace() API availability before using it

 C libraries besides glibc do not have backtrace() implemented

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending

+---
  configure.ac | 2 ++
  src/log.c    | 5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)
@@ -51,5 +50,5 @@ index a693bd0..5b40c1f 100644
  }

 --
-2.5.1
+2.1.4

diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 0593427..e86bff9 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,7 +1,7 @@
-From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
+From fbd4e0d953ceb74f7fb87f52915986271d2bfa43 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 6 Apr 2015 23:02:21 -0700
-Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
+Subject: [PATCH 3/4] resolve: musl does not implement res_ninit

 ported from
 http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
@@ -9,6 +9,7 @@ http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
 Upstream-Status: Pending

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  gweb/gresolv.c | 33 ++++++++++++---------------------
  1 file changed, 12 insertions(+), 21 deletions(-)
@@ -73,5 +74,5 @@ index 5cf7a9a..3ad8e70 100644

  		if (!resolv->nameserver_list)
 --
-2.5.1
+2.1.4

diff --git a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch b/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
index 6327aa2..d0515ad 100644
--- a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
+++ b/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
@@ -1,12 +1,11 @@
-From 67645a01a2f3f52625d8dd77f2811a9e213e1b7d Mon Sep 17 00:00:00 2001
+From db846f5909fd6be29f4b2397182012993998cc1f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 13 Sep 2015 13:28:20 -0700
-Subject: [PATCH] Fix header inclusions for musl
+Subject: [PATCH 4/4] Fix header inclusions for musl

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending

+---
  gweb/gresolv.c        | 1 +
  plugins/wifi.c        | 3 +--
  src/tethering.c       | 2 --
@@ -81,5 +80,5 @@ index 551cae9..226ba86 100644
  #include <netinet/in.h>
  #include <sys/types.h>
 --
-2.5.1
+2.1.4

diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
index 707b3ca..666e87f 100644
--- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
@@ -1,9 +1,17 @@
-Because Poky doesn't support at_console we need to special-case the session
-user.
+From cd934d3de8a5336f26f7c13b3a0583d0054e6a73 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Thu, 24 Sep 2015 13:31:57 +0300
+Subject: [PATCH 1/4] Because Poky doesn't support at_console we need to
+ special-case the session user.

 Upstream-Status: Inappropriate [configuration]

-Signed-off-by: Ross Burton <ross.burton@intel.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+---
+ src/connman-dbus.conf | 3 +++
+ vpn/vpn-dbus.conf     | 3 +++
+ 2 files changed, 6 insertions(+)

 diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
 index 98a773e..466809c 100644
@@ -19,3 +27,20 @@ index 98a773e..466809c 100644
      <policy at_console="true">
          <allow send_destination="net.connman"/>
      </policy>
+diff --git a/vpn/vpn-dbus.conf b/vpn/vpn-dbus.conf
+index 0f0c8da..9ad05b9 100644
+--- a/vpn/vpn-dbus.conf
++++ b/vpn/vpn-dbus.conf
+@@ -6,6 +6,9 @@
+         <allow send_destination="net.connman.vpn"/>
+         <allow send_interface="net.connman.vpn.Agent"/>
+     </policy>
++    <policy user="xuser">
++        <allow send_destination="net.connman"/>
++    </policy>
+     <policy at_console="true">
+         <allow send_destination="net.connman.vpn"/>
+     </policy>
+--
+2.1.4
+