diff --git a/debian/changelog b/debian/changelog
index 74cfe28..25451ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ubuntu-dev-tools (0.158) UNRELEASED; urgency=medium
   * grep-merges: Do not override author or uploader with None
     There can be JSON entries which have uploader=None.
 
+  [ Colin Watson ]
+  * pbuilder-dist, ubuntu-build: Add s390x.
+
  -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 May 2016 09:04:03 +0200
 
 ubuntu-dev-tools (0.157) unstable; urgency=medium
diff --git a/doc/ubuntu-build.1 b/doc/ubuntu-build.1
index bcde75c..9e67da8 100644
--- a/doc/ubuntu-build.1
+++ b/doc/ubuntu-build.1
@@ -38,7 +38,7 @@ operations.
 \fB\-a\fR ARCHITECTURE, \fB\-\-arch\fR=\fIARCHITECTURE\fR
 Rebuild or rescore a specific architecture. Valid
 architectures include: amd64, sparc, powerpc, i386,
-armel, armhf, arm64, ia64, lpia, hppa.
+armel, armhf, arm64, ia64, lpia, hppa, ppc64el, s390x.
 .TP
 Batch processing:
 .IP
diff --git a/pbuilder-dist b/pbuilder-dist
index 870ee0f..7a7694a 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -438,7 +438,7 @@ def main():
     elif len(args) > 0 and args[0] in (
             'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64',
             'i386', 'lpia', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64',
-            'ppc64el', 'sh4', 'sh4eb', 'sparc', 'sparc64'):
+            'ppc64el', 's390x', 'sh4', 'sh4eb', 'sparc', 'sparc64'):
         requested_arch = args.pop(0)
     else:
         requested_arch = None
diff --git a/ubuntu-build b/ubuntu-build
index 1ba279b..5153d56 100755
--- a/ubuntu-build
+++ b/ubuntu-build
@@ -40,7 +40,7 @@ def main():
 
     # Valid architectures.
     valid_archs = set(["armel", "armhf", "arm64", "amd64", "hppa", "i386", "ia64",
-                       "lpia", "powerpc", "ppc64el", "sparc"])
+                       "lpia", "powerpc", "ppc64el", "s390x", "sparc"])
 
     # Prepare our option parser.
     opt_parser = OptionParser(usage)