diff --git a/boltdb_bolt_add_brokenUnaligned.patch b/boltdb_bolt_add_brokenUnaligned.patch
new file mode 100644
index 0000000..af8df30
--- /dev/null
+++ b/boltdb_bolt_add_brokenUnaligned.patch
@@ -0,0 +1,27 @@
+From: Michel Normand <normand@linux.vnet.ibm.com>
+Subject: boltdb bolt add brokenUnaligned for ppc64
+Date: Tue, 20 Dec 2016 10:19:01 +0100
+
+boltdb bolt add brokenUnaligned for ppc64
+as already done for bolt_ppc64le.go
+
+Correction already submitted upstream as
+https://github.com/boltdb/bolt/pull/635
+
+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+---
+ vendor/src/github.com/boltdb/bolt/bolt_ppc64.go |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: docker-1.12.3/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+===================================================================
+--- docker-1.12.3.orig/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
++++ docker-1.12.3/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+@@ -7,3 +7,6 @@ const maxMapSize = 0xFFFFFFFFFFFF // 256
+ 
+ // maxAllocSize is the size used when creating array pointers.
+ const maxAllocSize = 0x7FFFFFFF
++
++// Are unaligned load/stores broken on this arch?
++var brokenUnaligned = false
+
diff --git a/docker.changes b/docker.changes
index 95f053f..7551508 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 20 12:41:33 UTC 2016 - normand@linux.vnet.ibm.com
+
+- remove netlink_gcc_go.patch after integration of PR
+  https://github.com/golang/go/issues/11707
+- new boltdb_bolt_add_brokenUnaligned.patch for ppc64
+  waiting for https://github.com/boltdb/bolt/pull/635
+
 -------------------------------------------------------------------
 Tue Dec 20 05:08:54 UTC 2016 - asarai@suse.com
 
diff --git a/docker.spec b/docker.spec
index 2c1f72c..9904640 100644
--- a/docker.spec
+++ b/docker.spec
@@ -61,8 +61,8 @@ Source9:        docker-update-message.txt
 Source10:       tests.sh
 # Fixes for architecture-specific issues (gcc-go).
 Patch100:       gcc-go-patches.patch
-Patch101:       netlink_gcc_go.patch
 Patch102:       netlink_netns_powerpc.patch
+Patch103:       boltdb_bolt_add_brokenUnaligned.patch
 # SUSE-FEATURE: Adds the /run/secrets mountpoint inside all Docker containers
 # which is not snapshotted when images are committed. Note that if you modify
 # this patch, please also modify the patch in the suse-secrets-v<version>
@@ -174,8 +174,8 @@ Test package for docker. It contains the source code and the tests.
 %endif
 %ifnarch %{go_arches}
 %patch100 -p1
-%patch101 -p1
 %patch102 -p1
+%patch103 -p1
 %endif
 %patch300 -p1
 cp %{SOURCE7} .
diff --git a/netlink_gcc_go.patch b/netlink_gcc_go.patch
deleted file mode 100644
index 19fb111..0000000
--- a/netlink_gcc_go.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux.go b/vendor/src/github.com/vishvananda/netlink/link_linux.go
-index 3aa9124..6ad7c2b 100644
---- a/vendor/src/github.com/vishvananda/netlink/link_linux.go
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux.go
-@@ -415,11 +415,11 @@ func LinkAdd(link Link) error {
- 		req.Flags |= syscall.IFF_TUN_EXCL
- 		copy(req.Name[:15], base.Name)
- 		req.Flags |= uint16(tuntap.Mode)
--		_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETIFF), uintptr(unsafe.Pointer(&req)))
-+		_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETIFF), uintptr(unsafe.Pointer(&req)))
- 		if errno != 0 {
- 			return fmt.Errorf("Tuntap IOCTL TUNSETIFF failed, errno %v", errno)
- 		}
--		_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETPERSIST), 1)
-+		_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETPERSIST), 1)
- 		if errno != 0 {
- 			return fmt.Errorf("Tuntap IOCTL TUNSETPERSIST failed, errno %v", errno)
- 		}
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_others.go b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
-new file mode 100644
-index 0000000..feb6070
---- /dev/null
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
-@@ -0,0 +1,9 @@
-+// +build linux
-+// +build x86_64 arm64 s390x
-+
-+package netlink
-+
-+const (
-+	syscall_TUNSETIFF     = 0x400454ca
-+	syscall_TUNSETPERSIST = 0x400454ca
-+)
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
-new file mode 100644
-index 0000000..fac7c06
---- /dev/null
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
-@@ -0,0 +1,9 @@
-+// +build linux
-+// +build ppc64 ppc64le
-+
-+package netlink
-+
-+const (
-+	syscall_TUNSETIFF     = 0x800454ca
-+	syscall_TUNSETPERSIST = 0x800454ca
-+)