diff --git a/docker.changes b/docker.changes
index 42e87ab..8f943aa 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  8 13:27:55 UTC 2016 - dmueller@suse.com
+
+- use go-lang for aarch64:
+  - drop fix_platform_type_arm.patch (works around a gcc-go bug, so
+  unnecessary)
+
 -------------------------------------------------------------------
 Thu Apr  7 09:35:40 UTC 2016 - asarai@suse.de
 
diff --git a/docker.spec b/docker.spec
index 49ab1df..ea4636c 100644
--- a/docker.spec
+++ b/docker.spec
@@ -21,7 +21,7 @@
 %define docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete
 
 %define git_version 9e83765
-%define go_arches %ix86 x86_64
+%define go_arches %ix86 x86_64 aarch64
 Name:           docker
 Version:        1.10.3
 Release:        0
@@ -45,7 +45,6 @@ Source7:        README_SUSE.md
 Source8:        docker-audit.rules
 # TODO: remove once we figure out what is wrong with iptables on ppc64le
 Source100:      sysconfig.docker.ppc64le
-Patch0:         fix_platform_type_arm.patch
 Patch1:         gcc5_socket_workaround.patch
 Patch2:         fix-docker-init.patch
 Patch3:         fix-apparmor.patch
@@ -156,7 +155,6 @@ Test package for docker. It contains the source code and the tests.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # 1330 is Tumbleweed after leap has been released
 # gcc5-go in Tumbleweed includes this commit
 # https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b09626f5545eb
diff --git a/fix_platform_type_arm.patch b/fix_platform_type_arm.patch
deleted file mode 100644
index 90598a3..0000000
--- a/fix_platform_type_arm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pkg/platform/utsname_int8.go b/pkg/platform/utsname_int8.go
-index 5dcbadf..a022a35 100644
---- a/pkg/platform/utsname_int8.go
-+++ b/pkg/platform/utsname_int8.go
-@@ -1,4 +1,4 @@
--// +build linux,386 linux,amd64 linux,arm64
-+// +build linux,386 linux,amd64
- // see golang's sources src/syscall/ztypes_linux_*.go that use int8
-
- package platform
-diff --git a/pkg/platform/utsname_uint8.go b/pkg/platform/utsname_uint8.go
-index c9875cf..0ee937a 100644
---- a/pkg/platform/utsname_uint8.go
-+++ b/pkg/platform/utsname_uint8.go
-@@ -1,4 +1,4 @@
--// +build linux,arm linux,ppc64 linux,ppc64le s390x
-+// +build linux,arm linux,ppc64 linux,ppc64le s390x linux,arm64 linux,aarch64
- // see golang's sources src/syscall/ztypes_linux_*.go that use uint8
-
- package platform