diff --git a/inventory/builders b/inventory/builders
index bc20e764e2..35c584c307 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -49,6 +49,9 @@ buildvm-ppc64le-06.ppc.fedoraproject.org
 buildvm-ppc64le-07.ppc.fedoraproject.org
 buildvm-ppc64le-08.ppc.fedoraproject.org
 
+[buildvm-s390]
+buildvm-s390-01.s390.fedoraproject.org
+
 [buildvmhost]
 buildvmhost-10.phx2.fedoraproject.org
 buildvmhost-11.phx2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org
new file mode 100644
index 0000000000..411b995997
--- /dev/null
+++ b/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org
@@ -0,0 +1,28 @@
+---
+vmhost: virthost-s390.qa.fedoraproject.org
+eth0_ip: 10.5.129.81
+nm: 255.255.255.0
+gw: 10.5.129.254
+dns: 10.5.126.21
+main_bridge: br1
+
+# common items for the buildvm-* koji builders
+volgroup: /dev/vg_guests
+lvm_size: 150000
+mem_size: 10240
+num_cpus: 4
+ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-23
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
+
+# for systems that do not match the above - specify the same parameter in
+# the host_vars/$hostname file
+host_group: kojibuilder
+fas_client_groups: sysadmin-releng,sysadmin-secondary
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+virt_install_command: "{{ virt_install_command_one_nic }}"
+
+koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://s390.koji.fedoraproject.org/koji"
+koji_topurl: "http://s390pkgs.fedoraproject.org/"
+
diff --git a/inventory/host_vars/compose-s390-01.s390.fedoraproject.org b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org
new file mode 100644
index 0000000000..7d9246a891
--- /dev/null
+++ b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org
@@ -0,0 +1,23 @@
+---
+vmhost: virthost-s390.qa.fedoraproject.org
+volgroup: /dev/vg_guests
+ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-23
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
+virt_install_command: "{{ virt_install_command_one_nic }}"
+
+eth0_ip: 10.5.129.16
+nm: 255.255.255.0
+gw: 10.5.129.254
+dns: 10.5.126.21
+main_bridge: br1
+
+kojipkgs_url: s390pkgs.fedoraproject.org
+kojihub_url: 390koji.fedoraproject.org/kojihub
+kojihub_scheme: https
+
+koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://s390.koji.fedoraproject.org/koji"
+koji_topurl: "http://s390pkgs.fedoraproject.org/"
+
+fas_client_groups: sysadmin-releng,sysadmin-secondary
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
diff --git a/inventory/inventory b/inventory/inventory
index 2b92f11a13..ecdfbec06e 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -38,6 +38,7 @@ rawhide-composer.phx2.fedoraproject.org
 compose-aarch64-01.arm.fedoraproject.org
 compose-ppc64-01.ppc.fedoraproject.org
 compose-ppc64le-01.ppc.fedoraproject.org
+compose-s390-01.s390.fedoraproject.org
 
 [releng-stg]
 composer.stg.phx2.fedoraproject.org