diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh.bsfix	2018-03-30 18:21:11.000000000 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh	2018-04-09 12:10:34.906465599 +0200
@@ -31,6 +31,16 @@ if [[ "${host_platform}" == "linux/arm64
   platforms+=( "linux/arm64" )
 fi
 
+# Special case arm
+if [[ "${host_platform}" == "linux/arm" ]]; then
+  platforms+=( "linux/arm" )
+fi
+
+# Special case i386
+if [[ "${host_platform}" == "linux/386" ]]; then
+  platforms+=( "linux/386" )
+fi
+
 # Special case s390x
 if [[ "${host_platform}" == "linux/s390x" ]]; then
   platforms+=( "linux/s390x" )
diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh.bsfix	2018-03-30 18:21:11.000000000 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh	2018-04-09 12:10:34.907465596 +0200
@@ -31,6 +31,16 @@ if [[ "${host_platform}" == "linux/arm64
   platforms+=( "linux/arm64" )
 fi
 
+# Special case arm
+if [[ "${host_platform}" == "linux/arm" ]]; then
+  platforms+=( "linux/arm" )
+fi
+
+# Special case i386
+if [[ "${host_platform}" == "linux/386" ]]; then
+  platforms+=( "linux/386" )
+fi
+
 # Special case s390x
 if [[ "${host_platform}" == "linux/s390x" ]]; then
   platforms+=( "linux/s390x" )
diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/build-cross.sh.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/build-cross.sh
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/build-cross.sh.bsfix	2018-03-30 18:21:11.000000000 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/build-cross.sh	2018-04-09 12:10:34.907465596 +0200
@@ -27,11 +27,21 @@ if [[ "${host_platform}" == "linux/arm64
   platforms+=( "linux/arm64" )
 fi
 
+# Special case armv7hl
+if [[ "${host_platform}" == "linux/arm" ]]; then
+  platforms+=( "linux/arm" )
+fi
+
 # Special case s390x
 if [[ "${host_platform}" == "linux/s390x" ]]; then
   platforms+=( "linux/s390x" )
 fi
 
+# Special case 386
+if [[ "${host_platform}" == "linux/386" ]]; then
+  platforms+=( "linux/386" )
+fi
+
 # On linux platforms, build images
 if [[ "${host_platform}" == linux/* ]]; then
   image_platforms+=( "${host_platform}" )
diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/lib/build/binaries.sh.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/lib/build/binaries.sh
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/lib/build/binaries.sh.bsfix	2018-03-30 18:21:11.000000000 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/hack/lib/build/binaries.sh	2018-04-09 12:10:34.907465596 +0200
@@ -41,6 +41,8 @@ function os::build::host_platform_friend
     echo "linux-powerpc64"
   elif [[ $platform == "linux/arm64" ]]; then
     echo "linux-arm64"
+  elif [[ $platform == "linux/arm" ]]; then
+    echo "linux-arm"
   elif [[ $platform == "linux/s390x" ]]; then
     echo "linux-s390"
   else
@@ -363,6 +365,7 @@ function os::build::place_bins() {
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::zip "${OS_BINARY_RELEASE_CLIENT_MAC[@]}"
         elif [[ $platform == "linux-32bit" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
+          OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive::tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
         elif [[ $platform == "linux-64bit" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
           OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive::tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
@@ -372,6 +375,9 @@ function os::build::place_bins() {
         elif [[ $platform == "linux-arm64" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
           OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive::tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
+        elif [[ $platform == "linux-arm" ]]; then
+          OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
+          OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive::tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
         elif [[ $platform == "linux-s390" ]]; then
           OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive::tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}"
           OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive::tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}"
@@ -379,7 +385,7 @@ function os::build::place_bins() {
           echo "++ ERROR: No release type defined for $platform"
         fi
       else
-        if [[ $platform == "linux-64bit" || $platform == "linux-powerpc64" || $platform == "linux-arm64" || $platform == "linux-s390" ]]; then
+        if [[ $platform == "linux-64bit" || $platform == "linux-32bit" || $platform == "linux-powerpc64" || $platform == "linux-arm64" || $platform == "linux-arm" || $platform == "linux-s390" ]]; then
           os::build::archive::tar "./*"
         else
           echo "++ ERROR: No release type defined for $platform"
diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/image-registry-fef8b8b5ff6c348ff3efdd518398314234587d8e/hack/build-cross.sh.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/image-registry-fef8b8b5ff6c348ff3efdd518398314234587d8e/hack/build-cross.sh
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/image-registry-fef8b8b5ff6c348ff3efdd518398314234587d8e/hack/build-cross.sh.bsfix	2018-04-09 13:05:55.528696315 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/image-registry-fef8b8b5ff6c348ff3efdd518398314234587d8e/hack/build-cross.sh	2018-04-09 13:07:13.388453101 +0200
@@ -32,6 +32,16 @@ if [[ "${host_platform}" == "linux/s390x
   platforms+=( "linux/s390x" )
 fi
 
+# Special case arm
+if [[ "${host_platform}" == "linux/arm" ]]; then
+  platforms+=( "linux/arm" )
+fi
+
+# Special case i386
+if [[ "${host_platform}" == "linux/386" ]]; then
+  platforms+=( "linux/386" )
+fi
+
 # On linux platforms, build images
 if [[ "${host_platform}" == linux/* ]]; then
   image_platforms+=( "${host_platform}" )
diff -up origin-191fece9305a76f262baacc9de72c2c8cb4d5601/origin.spec.bsfix origin-191fece9305a76f262baacc9de72c2c8cb4d5601/origin.spec
--- origin-191fece9305a76f262baacc9de72c2c8cb4d5601/origin.spec.bsfix	2018-03-30 18:21:11.000000000 +0200
+++ origin-191fece9305a76f262baacc9de72c2c8cb4d5601/origin.spec	2018-04-09 12:10:34.907465596 +0200
@@ -254,9 +254,12 @@ of docker.  Exclude those versions of do
 %ifarch ppc64le
   BUILD_PLATFORM="linux/ppc64le"
 %endif
-%ifarch %{arm} aarch64
+%ifarch aarch64
   BUILD_PLATFORM="linux/arm64"
 %endif
+%ifarch %{arm}
+  BUILD_PLATFORM="linux/arm"
+%endif
 %ifarch s390x
   BUILD_PLATFORM="linux/s390x"
 %endif