diff --git a/SOURCES/0001-linuxfsutil-Pass-int-to-ioctl-not-long.patch b/SOURCES/0001-linuxfsutil-Pass-int-to-ioctl-not-long.patch
new file mode 100644
index 0000000..c295dd6
--- /dev/null
+++ b/SOURCES/0001-linuxfsutil-Pass-int-to-ioctl-not-long.patch
@@ -0,0 +1,27 @@
+From 06ed04a816141914adb9bd3e32392801fce5bc8e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 21 Aug 2020 17:40:41 +0000
+Subject: [PATCH] linuxfsutil: Pass int to ioctl, not long
+
+Otherwise it will fail on big-endian architectures like s390x.
+Ref https://bugzilla.redhat.com/show_bug.cgi?id=1867601
+---
+ src/libostree/ostree-linuxfsutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-linuxfsutil.c b/src/libostree/ostree-linuxfsutil.c
+index 231ecf76..cb778def 100644
+--- a/src/libostree/ostree-linuxfsutil.c
++++ b/src/libostree/ostree-linuxfsutil.c
+@@ -55,7 +55,7 @@ _ostree_linuxfs_fd_alter_immutable_flag (int            fd,
+   if (g_atomic_int_get (&no_alter_immutable))
+     return TRUE;
+ 
+-  unsigned long flags;
++  int flags = 0;
+   int r = ioctl (fd, EXT2_IOC_GETFLAGS, &flags);
+   if (r == -1)
+     {
+-- 
+2.26.2
+
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index e45903a..eb4e7f0 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -8,11 +8,13 @@
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
 Version: 2020.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
+Patch0: 0001-linuxfsutil-Pass-int-to-ioctl-not-long.patch
+
 BuildRequires: git
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool
@@ -162,6 +164,11 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Mon Aug 24 2020 Colin Walters <walters@verbum.org> - 2020.5-3
+- Backport
+  https://github.com/ostreedev/ostree/pull/2179/commits/06ed04a816141914adb9bd3e32392801fce5bc8e
+  Resolves: #1867601
+
 * Tue Aug 18 2020 Colin Walters <walters@verbum.org> - 2020.5-2
 - Update to https://github.com/ostreedev/ostree/releases/tag/v2020.5
   Specifically to fix readonly-sysroot for e.g. RHEL Edge and