diff --git a/docker.spec b/docker.spec
index dc1b7e6..9049772 100644
--- a/docker.spec
+++ b/docker.spec
@@ -44,10 +44,15 @@ Source100:      sysconfig.docker.ppc64le
 Patch0:         fix_platform_type_arm.patch
 Patch1:         gcc5_socket_workaround.patch
 Patch2:         fix-docker-init.patch
-Patch100:       gcc-go-patches.patch
-Patch101:       fix-ppc64le.patch
+# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
+# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
+# We cannot do that, right now a quick and really dirty way to get it running is
+# to simply disable this check
+Patch100:       ignore-dockerinit-checksum.patch
+Patch101:       gcc-go-patches.patch
 Patch102:       netlink_gcc_go.patch
-Patch103:       ignore-dockerinit-checksum.patch
+#TODO: rename this patch later on
+Patch108:       ignore-dockerinit-checksum.patch
 BuildRequires:  audit
 BuildRequires:  bash-completion
 BuildRequires:  device-mapper-devel >= 1.2.68
@@ -153,14 +158,10 @@ Test package for docker. It contains the source code and the tests.
 %endif
 %patch2 -p1
 %ifnarch %go_arches
-%patch100 -p1
 %patch101 -p1
+%patch108 -p1
 %patch102 -p1
-# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
-# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
-# We cannot do that, right now a quick and really dirty way to get it running is
-# to simply disable this check
-%patch103 -p1
+%patch100 -p1
 %endif
 cp %{SOURCE7} .
 
diff --git a/fix-ppc64le.patch b/fix-ppc64le.patch
index fd5afb1..a4c7a40 100644
--- a/fix-ppc64le.patch
+++ b/fix-ppc64le.patch
@@ -1,4 +1,3 @@
-
 Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
 ===================================================================
 --- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
@@ -6,9 +5,9 @@ Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netli
 @@ -1,4 +1,4 @@
 -// +build arm ppc64 ppc64le
 +// +build arm ppc64,!ppc64le
-
+ 
  package bridge
-
+ 
 Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
 ===================================================================
 --- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
@@ -16,5 +15,6 @@ Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netli
 @@ -1,4 +1,4 @@
 -// +build !arm,!ppc64,!ppc64le
 +// +build !arm,!ppc64 ppc64le
-
+ 
  package bridge
+