diff --git a/fedora.conf b/fedora.conf
index 5fa8af4..2a3283d 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -301,7 +301,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Base',
@@ -321,7 +321,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Minimal_Base',
@@ -343,11 +343,11 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
-                    'failable': ['ppc64', 'ppc64le'],
+                    'failable': ['ppc64', 'ppc64le', 's390x'],
                      }
         },
         {
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 06e3b2c..34b06d9 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -14,6 +14,7 @@
             <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -23,6 +24,7 @@
             <arch>armhfp</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -142,6 +144,7 @@
             <arch>aarch64</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
         <groups>