diff --git a/.travis.yml b/.travis.yml
index 1e686ce5..acaf5933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,26 +9,32 @@ go:
 
 env:
   global:
-    - TOOLS_CMD=golang.org/x/tools/cmd
-    - PATH=$GOROOT/bin:$PATH
-    - GO15VENDOREXPERIMENT=1
+  - TOOLS_CMD=golang.org/x/tools/cmd
+  - PATH=$GOROOT/bin:$PATH
+  - GO15VENDOREXPERIMENT=1
   matrix:
-   - TARGET=amd64
-   - TARGET=arm
-   - TARGET=arm64
-   - TARGET=ppc64le
+  - TARGET=amd64
+  - TARGET=arm
+  - TARGET=arm64
+  - TARGET=ppc64le
+  - TARGET=s390x
 
 matrix:
   fast_finish: true
   allow_failures:
-    - go: tip
+  - go: tip
   exclude:
-    - go: tip
-      env: arm
-    - go: tip
-      env: arm64
-    - go: tip
-      env: ppc64le
+  - go: tip
+    env: TARGET=arm
+  - go: tip
+    env: TARGET=arm64
+  - go: tip
+    env: TARGET=ppc64le
+  - go: tip
+    env: TARGET=s390x
+  - go: 1.6.x
+    env: TARGET=s390x
+
 
 install:
  - go get ${TOOLS_CMD}/cover
diff --git a/scripts/release-with-rkt.sh b/scripts/release-with-rkt.sh
index 9ad1228b..dbc3551d 100755
--- a/scripts/release-with-rkt.sh
+++ b/scripts/release-with-rkt.sh
@@ -27,7 +27,7 @@ sudo -E rkt run \
     --exec /bin/bash \
     -- -xe -c "\
     ${FEDORA_INSTALL}; cd /opt/src; umask 0022; 
-    for arch in amd64 arm arm64 ppc64le; do \
+    for arch in amd64 arm arm64 ppc64le s390x; do \
         CGO_ENABLED=0 GOARCH=\$arch ./build ${BUILDFLAGS}; \
         for format in txz tbz2 tgz; do \
             FILENAME=cni-\$arch-${TAG}.\$format; \