diff --git a/cipd b/cipd
index e7b39e3f4..e36896675 100755
--- a/cipd
+++ b/cipd
@@ -9,10 +9,17 @@ set -e -o pipefail
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 CYGWIN=false
 
+# Make sure this starts empty
+ARCH=
+
 UNAME=`uname -s | tr '[:upper:]' '[:lower:]'`
 case "${UNAME}" in
+  aix)
+    OS="${UNAME}"
+    ARCH="ppc64"  # apparently 'uname -m' returns something very different
+    ;;
   linux)
-    OS=linux
+    OS="${UNAME}"
     ;;
   cygwin*)
     OS=windows
@@ -29,43 +36,39 @@ case "${UNAME}" in
     exit 1
 esac
 
-UNAME=`uname -m | tr '[:upper:]' '[:lower:]'`
-case "${UNAME}" in
-  x86_64|amd64)
-    ARCH=amd64
-    ;;
-  s390x)  # best-effort support for IBM s390x: crbug.com/764087
-    ARCH=s390x
-    ;;
-  ppc64)  # best-effort support for 64-bit PowerPC: crbug.com/773857
-    ARCH=ppc64
-    ;;
-  ppc64le)  # best-effort support for 64-bit PowerPC/LE: crbug.com/773857
-    ARCH=ppc64le
-    ;;
-  aarch64)
-    ARCH=arm64
-    ;;
-  armv7l)
-    ARCH=armv6l
-    ;;
-  arm*)
-    ARCH="${UNAME}"
-    ;;
-  *86)
-    ARCH=386
-    ;;
-  mips*)
-    # detect mips64le vs mips64.
-    ARCH="${UNAME}"
-    if lscpu | grep -q "Little Endian"; then
-      ARCH+=le
-    fi
-    ;;
-  *)
-    >&2 echo "UNKNOWN Machine architecture: ${UNAME}"
-    exit 1
-esac
+if [ -z $ARCH ]; then
+  UNAME=`uname -m | tr '[:upper:]' '[:lower:]'`
+  case "${UNAME}" in
+    x86_64|amd64)
+      ARCH=amd64
+      ;;
+    s390x|ppc64|ppc64le)  # best-effort support
+      ARCH="${UNAME}"
+      ;;
+    aarch64)
+      ARCH=arm64
+      ;;
+    armv7l)
+      ARCH=armv6l
+      ;;
+    arm*)
+      ARCH="${UNAME}"
+      ;;
+    *86)
+      ARCH=386
+      ;;
+    mips*)
+      # detect mips64le vs mips64.
+      ARCH="${UNAME}"
+      if lscpu | grep -q "Little Endian"; then
+        ARCH+=le
+      fi
+      ;;
+    *)
+      >&2 echo "UNKNOWN Machine architecture: ${UNAME}"
+      exit 1
+  esac
+fi
 
 # CIPD_BACKEND can be changed to ...-dev for manual testing.
 CIPD_BACKEND="https://chrome-infra-packages.appspot.com"
diff --git a/cipd_client_version b/cipd_client_version
index 61611f6a2..bd3c4ff14 100644
--- a/cipd_client_version
+++ b/cipd_client_version
@@ -1 +1 @@
-git_revision:9f9afb5ef6ef9d4887e8aa2bb617dfdd798f8005
+git_revision:0323cbe1ef467af36aa6784f2315c5ee36e89e34
diff --git a/cipd_client_version.digests b/cipd_client_version.digests
index 49cacbf85..efde7bbc9 100644
--- a/cipd_client_version.digests
+++ b/cipd_client_version.digests
@@ -1,21 +1,22 @@
 # This file was generated by
 #
 #  cipd selfupdate-roll -version-file cipd_client_version \
-#      -version git_revision:9f9afb5ef6ef9d4887e8aa2bb617dfdd798f8005
+#      -version git_revision:0323cbe1ef467af36aa6784f2315c5ee36e89e34
 #
 # Do not modify manually. All changes will be overwritten.
 # Use 'cipd selfupdate-roll ...' to modify.
 
-linux-386       sha256  fcd643a163dd52d919090256a87fc20fe708fe8c6265778d4055dfdadb95f3c3
-linux-amd64     sha256  b6a257a67136f88e91562e4043ec1133a2d6ad8eadca377a2fb4226108d15ba6
-linux-arm64     sha256  e0aed941afd051f57541e5a8457d632cfe8cf63b23c2fcecb9c1a59054bde6e7
-linux-armv6l    sha256  0367003b6c5bd5dff1a50a439002a577459a791c59ec6799426eb53ccbd374e7
-linux-mips64    sha256  2afd563bd285f5ec7de445df26f37296f010da1005897c31bdbebb3834842d7c
-linux-mips64le  sha256  1804c14c2525fc1b150543a5b14c25482be2d5f64f60d3c6d494379ed4f4ecc5
-linux-mipsle    sha256  a56263289dd2e81fb3d5f3cf3eb49f938306ba02b80edd17c315df133d9e0266
-linux-ppc64     sha256  ca6219cf4e1c77c5dc121823b918a7f5444b49c043562c51c8f39cc1065bdb9a
-linux-ppc64le   sha256  c935e33d156925ed81532c26841b54496b10836c06896ba76b8a32fbf5aaba4c
-linux-s390x     sha256  c93891c8bcae98146b308e4dbe9ab8e61d1706f1b9f19138c743cdf75697520d
-mac-amd64       sha256  5d8e9235d24952670bcae362c8a8342d5bbfeb61f811355454e370aacaca79bd
-windows-386     sha256  a0d9af875c79f4b890cabf3ffd196789ca813d429ffb7b0408d02b9859e606fd
-windows-amd64   sha256  1ed772ca1e94ac7a413485d0861df32b362fb9718bb86cc204fb60e1a5fc16a3
+aix-ppc64       sha256  df6bf19e60cf062c0a9d186b0f6c9377c144af9af2511c62feb12166df658fa0
+linux-386       sha256  406a37dfc1e36495edcedb1fa58a101fc10369fccf88a1a68e89181b5b634069
+linux-amd64     sha256  f87c547d09c75eaac7aec940489ed4282988f0628cda232c36666bbd7f2ffcd3
+linux-arm64     sha256  a172f66db1e5951173282b4d5a00ca78c6c19b98aa4025356ca555d802562d18
+linux-armv6l    sha256  8bbda6a984e0f386d899da2da5b94d4601dc19a1ceeb42b6e691c2844ff6c1ce
+linux-mips64    sha256  60f7961bdfab674fd84680e74c42c8b305ff7ee98d1eb626ac36fc327c8654c2
+linux-mips64le  sha256  58e9df2ec3544124747b56699787210aded97d7ccd2459ec877753a32070dd18
+linux-mipsle    sha256  2a5e019011ba90b8e94a5cc9b2bd82f34d193e3c51f8548d8a5b87b526fc0e83
+linux-ppc64     sha256  7fbf4080e68ff4eda82a8a62da1645bda265bc6c1bef034c76e3848244223a5d
+linux-ppc64le   sha256  7a474bb3661c88d1f326a51f99f8e0dc7f832bfd404615f8a6be162ce1840dc0
+linux-s390x     sha256  4aafb01114114395510d2e95e175198e7335247c49ed37ad334526815e3eca05
+mac-amd64       sha256  50d685478353f3243b79a318130c8cd1dd1074fc5a9b84c8bbd14546dfe9288a
+windows-386     sha256  642cb36aac344a94092bc15662c6a43117a2db9e0d2befdc0dc63e14518ec07d
+windows-amd64   sha256  e30a7b981ffab1d54fb1395c2ac183811c1aa17e57a649f877da99a1cfa72176