diff --git a/kdump.sysconfig.s390x b/kdump.sysconfig.s390x
new file mode 100644
index 0000000..0614871
--- /dev/null
+++ b/kdump.sysconfig.s390x
@@ -0,0 +1,35 @@
+# Kernel Version string for the -kdump kernel, such as 2.6.13-1544.FC5kdump
+# If no version is specified, then the init script will try to find a
+# kdump kernel with the same version number as the running kernel.
+KDUMP_KERNELVER=""
+
+# The kdump commandline is the command line that needs to be passed off to
+# the kdump kernel.  This will likely match the contents of the grub kernel
+# line.  For example:
+#   KDUMP_COMMANDLINE="ro root=LABEL=/"
+# If a command line is not specified, the default will be taken from
+# /proc/cmdline
+KDUMP_COMMANDLINE=""
+
+# This variable lets us append arguments to the current kdump commandline
+# As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline
+KDUMP_COMMANDLINE_APPEND="maxcpus=1 cgroup_disable=memory"
+
+# Any additional /sbin/mkdumprd arguments required.
+MKDUMPRD_ARGS=""
+
+# Any additional kexec arguments required.  In most situations, this should
+# be left empty
+#
+# Example:
+#   KEXEC_ARGS="--elf32-core-headers"
+KEXEC_ARGS=""
+
+#Where to find the boot image
+KDUMP_BOOTDIR="/boot"
+
+#What is the image type used for kdump
+KDUMP_IMG="vmlinuz"
+
+#What is the images extension.  Relocatable kernels don't have one
+KDUMP_IMG_EXT=""
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 48c6b80..c5cd9b1 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -22,6 +22,7 @@ Source14: 98-kexec.rules
 Source15: kdump.conf.5
 Source16: kdump.service
 Source17: rhcrashkernel-param
+Source18: kdump.sysconfig.s390x
 
 #######################################
 # These are sources for mkdumpramfs
@@ -40,7 +41,7 @@ BuildRequires: dash
 BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel bzip2-devel
 BuildRequires: pkgconfig intltool gettext 
 BuildRequires: systemd-units
-%ifarch %{ix86} x86_64 ppc64 ia64 ppc
+%ifarch %{ix86} x86_64 ppc64 ia64 ppc s390x
 Obsoletes: diskdumputils netdump
 %endif
 
@@ -66,7 +67,6 @@ Obsoletes: diskdumputils netdump
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
 #
-
 #
 # Patches 501 through 600 are meant for ppc kexec-tools enablement
 #
@@ -119,7 +119,7 @@ rm -f kexec-tools.spec.in
 cp %{SOURCE10} . 
 
 make
-%ifarch %{ix86} x86_64 ia64 ppc64
+%ifarch %{ix86} x86_64 ia64 ppc64 s390x
 make -C makedumpfile-1.4.2 LINKTYPE=dynamic
 %endif
 make -C kexec-tools-po
@@ -153,7 +153,7 @@ install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE17} $RPM_BUILD_ROOT/usr/sbin/rhcrashkernel-param
 
-%ifarch %{ix86} x86_64 ia64 ppc64
+%ifarch %{ix86} x86_64 ia64 ppc64 s390x
 install -m 755 makedumpfile-1.4.2/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
 install -m 644 makedumpfile-1.4.2/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
 %endif