diff --git a/elfutils-0.169-s390x-ptrace.patch b/elfutils-0.169-s390x-ptrace.patch
new file mode 100644
index 0000000..86e51e8
--- /dev/null
+++ b/elfutils-0.169-s390x-ptrace.patch
@@ -0,0 +1,27 @@
+commit 1dd301b7c302b9df980946e2d04ca99748754991
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Mon Jul 17 17:26:25 2017 +0200
+
+    backends: Swap sys/ptrace.h and asm/ptrace.h include order on s390.
+    
+    glibc 2.26 changed the sys/ptrace.h header so that it cannot be included
+    after asm/ptrace.h. We still need to include the kernel asm/ptrace.h for
+    the ptrace_area definition. Including it after sys/ptrace.h works against
+    both old and new glibc.
+    
+    Signed-off-by: Mark Wielaard <mark@klomp.org>
+
+diff --git a/backends/s390_initreg.c b/backends/s390_initreg.c
+index 011305c..23bf8ed 100644
+--- a/backends/s390_initreg.c
++++ b/backends/s390_initreg.c
+@@ -34,8 +34,8 @@
+ #include <assert.h>
+ #if defined(__s390__) && defined(__linux__)
+ # include <sys/user.h>
+-# include <asm/ptrace.h>
+ # include <sys/ptrace.h>
++# include <asm/ptrace.h>
+ #endif
+ 
+ #define BACKEND s390_
diff --git a/elfutils.spec b/elfutils.spec
index caca5ac..e7370df 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,7 +1,7 @@
 Name: elfutils
 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
 Version: 0.169
-%global baserelease 4
+%global baserelease 5
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
 License: GPLv3+ and (GPLv2+ or LGPLv3+)
@@ -26,6 +26,7 @@ Source2: backtrace.ppc64le.fp.core.bz2
 Patch2: elfutils-0.169-dup-shstrtab.patch
 Patch3: elfutils-0.169-strip-empty.patch
 Patch4: elfutils-0.169-strip-keep-remove-section.patch
+Patch5: elfutils-0.169-s390x-ptrace.patch
 
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
@@ -181,6 +182,7 @@ cp %SOURCE1 %SOURCE2 tests/
 %patch2 -p1 -b .shstrtab_dup
 %patch3 -p1 -b .strip_empty
 %patch4 -p1 -b .strip_keep_remove
+%patch5 -p1 -b .s390_ptrace
 
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
@@ -311,6 +313,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Jul 17 2017 Mark Wielaard <mjw@fedoraproject.org> - 0.169-5
+- Fix build on s390 (ptrace.h). Add elfutils-0.169-s390x-ptrace.patch.
+
 * Mon Jul 17 2017 Mark Wielaard <mjw@fedoraproject.org> - 0.169-4
 - Add elfutils-0.169-strip-keep-remove-section.patch (#1465997)