diff --git a/file-5.40-magic-xzip.patch b/file-5.40-magic-xzip.patch
index 2b27f38..e4fed04 100644
--- a/file-5.40-magic-xzip.patch
+++ b/file-5.40-magic-xzip.patch
@@ -1,18 +1,37 @@
+From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 19 Apr 2021 17:01:45 +0000
+Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
+
+---
+ magic/Magdir/compress | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
 diff --git a/magic/Magdir/compress b/magic/Magdir/compress
-index 64d11a7..d830c64 100644
+index 64d11a736..41a65738f 100644
 --- a/magic/Magdir/compress
 +++ b/magic/Magdir/compress
-@@ -264,12 +264,7 @@
- >>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
+ # compress:  file(1) magic for pure-compression formats (no archives)
+ #
+ # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
+@@ -265,14 +265,13 @@
  
  # http://tukaani.org/xz/xz-file-format.txt
--0	ustring		\xFD7zXZ\x00		XZ compressed data, checksum
-->7	byte&0xf	0x0			NONE
-->7	byte&0xf	0x1			CRC32
-->7	byte&0xf	0x4			CRC64
-->7	byte&0xf	0xa			SHA-256
--
-+0	ustring		\xFD7zXZ\x00		XZ compressed data
- !:strength * 2
- !:mime	application/x-xz
+ 0	ustring		\xFD7zXZ\x00		XZ compressed data, checksum
++!:strength * 2
++!:mime	application/x-xz
+ >7	byte&0xf	0x0			NONE
+ >7	byte&0xf	0x1			CRC32
+ >7	byte&0xf	0x4			CRC64
+ >7	byte&0xf	0xa			SHA-256
  
+-!:strength * 2
+-!:mime	application/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0	string		LRZI			LRZIP compressed data
+ >4	byte		x			- version %d
diff --git a/file.spec b/file.spec
index 6957ba7..09a7c24 100644
--- a/file.spec
+++ b/file.spec
@@ -15,7 +15,7 @@
 Summary: Utility for determining file types
 Name: file
 Version: 5.40
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz
 
@@ -26,7 +26,7 @@ Patch0: file-localmagic.patch
 Patch1: file-4.17-rpm-name.patch
 Patch2: file-5.04-volume_key.patch
 
-# hotfix, revert the https://github.com/file/file/commit/4ebd747d commit.
+# Upstream commit 9b0459afab309a82aa4e46f73a4e50dd641f3d39
 Patch3: file-5.40-magic-xzip.patch
 
 URL: https://www.darwinsys.com/file/
@@ -207,6 +207,9 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Mon Apr 19 2021 Stephen Gallagher <sgallagh@redhat.com> - 5.40-4
+- Restore the xz commit with the upstream fix (#1947317)
+
 * Mon Apr 12 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.40-3
 - revert the https://github.com/file/file/commit/3ebd747d commit (#1947317)