Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -419,10 +419,36 @@
         {'name': "clang-s390x-linux",
          'slavenames':["systemz-1"],
          'builddir':"clang-s390x-linux",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
+                                                            checkout_lld=False,
+                                                            useTwoStage=False,
+                                                            stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
+
+        {'name' : "clang-s390x-linux-multistage",
+         'slavenames':["systemz-1"],
+         'builddir' :"clang-s390x-linux-multistage",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
+                                                            checkout_lld=False,
+                                                            useTwoStage=True,
+                                                            stage1_config='Release',
+                                                            stage2_config='Release',
+                                                            extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON']),
+         'category' : 'clang'},
+
+        {'name' : "clang-s390x-linux-lnt",
+         'slavenames':["systemz-1"],
+         'builddir' :"clang-s390x-linux-lnt",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(jobs=4,
+                                                            clean=False,
                                                             checkout_lld=False,
                                                             useTwoStage=False,
+                                                            runTestSuite=True,
                                                             stage1_config='Release',
+                                                            nt_flags=['--threads=4', '--build-threads=4'],
                                                             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
          'category' : 'clang'},
 
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -143,8 +143,8 @@
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-2", properties={'jobs': 16}, max_builds=1),
 
-        # zEnterprise 196 (s390x), SLES 12
-        create_slave("systemz-1", properties={'jobs': 4}, max_builds=1),
+        # IBM z13 (s390x), Ubuntu 16.04.2
+        create_slave("systemz-1", properties={'jobs': 4}, max_builds=4),
 
         # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz
         create_slave("ericwf-buildslave", properties={'jobs': 4}, max_builds=2),