diff --git a/lib/config.json b/lib/config.json
index dee8f99..efe63cc 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -5,6 +5,8 @@
 		 { "name" : "wildebeest-debian-wheezy-x86_64", "arch" : "x86_64", "jobs" : "2" },
 		 { "name" : "wildebeest-debian-wheezy-i686", "arch" : "i686", "jobs" : "2" },
 
+		 { "name" : "marist-fedora-s390x", "arch" : "s390x", "jobs" : "2" },
+
 		 { "name" : "fedora-21-ppc64be-1", "arch" : "ppc64be", "jobs" : "3" },
 		 { "name" : "fedora-21-ppc64be-2", "arch" : "ppc64be", "jobs" : "4" },
 
@@ -88,6 +90,11 @@
 		     "slavenames" : [ "wildebeest-debian-wheezy-i686" ] },
 
 
+		   { "name" : "Fedora-s390x-m64",
+		     "type" : "Plain_c64t64",
+		     "builddir" : "fedora-s390x",
+		     "slavenames" : [ "marist-fedora-s390x" ] },
+
 
 		   { "name" : "Fedora-ppc64be-m64", "type" : "Plain_c64t64",
 		     "builddir" : "fedora-ppc64be",
@@ -148,6 +155,8 @@
 					  "Debian-i686-native-extended-gdbserver",
 					  "Debian-i686",
 
+					  "Fedora-s390x-m64",
+
 					  "Fedora-ppc64be-m64",
 					  "Fedora-ppc64be-native-gdbserver-m64",
 					  "Fedora-ppc64be-native-extended-gdbserver-m64",