diff --git a/file-5.28-btrfs-image.dif b/file-5.28-btrfs-image.dif
index bb1185e..247d02a 100644
--- a/file-5.28-btrfs-image.dif
+++ b/file-5.28-btrfs-image.dif
@@ -13,10 +13,11 @@ contained within the image.
  magic/Magdir/filesystems |   37 +++++++++++++++++++++++--------------
  1 file changed, 23 insertions(+), 14 deletions(-)
 
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -2229,20 +2229,29 @@
+Index: file-5.31/magic/Magdir/filesystems
+===================================================================
+--- file-5.31.orig/magic/Magdir/filesystems
++++ file-5.31/magic/Magdir/filesystems
+@@ -2246,20 +2246,29 @@
  >>0x10060        string          >\0             lockproto %s)
  
  # Russell Coker <russell@coker.com.au>
diff --git a/file-5.31-fix-tga.dif b/file-5.31-fix-tga.dif
new file mode 100644
index 0000000..9c4d4d3
--- /dev/null
+++ b/file-5.31-fix-tga.dif
@@ -0,0 +1,38 @@
+From bb421c437d406760fb9f70f49e2eb5c504528450 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 5 Jun 2017 17:40:31 +0000
+Subject: [PATCH] use default to avoid dup printing (Stephan Kulow)
+
+---
+ magic/Magdir/images | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+Index: file-5.31/magic/Magdir/images
+===================================================================
+--- file-5.31.orig/magic/Magdir/images
++++ file-5.31/magic/Magdir/images
+@@ -35,11 +35,6 @@
+ >>>16	ubyte			<33
+ # skip more by looking for pixel size 0Fh 10h 18h 20h
+ >>>>16	ubyte&0xC0		0x00
+-# skip 260-16.ico by looking for no color map
+->>>>>1	ubyte			0
+-# implies no first map entry
+->>>>>>3	uleshort		0
+->>>>>>>0	use		tga-image
+ # Color Map
+ >>>>>1	belong&0xfff7ffff	0x01010000
+ >>>>>>0		use		tga-image
+@@ -47,6 +42,12 @@
+ >>>>>>0		use		tga-image
+ >>>>>1	belong&0xfff7ffff	0x00030000
+ >>>>>>0		use		tga-image
++>>>>>1	default			x
++# skip 260-16.ico by looking for no color map
++>>>>>>1	ubyte			0
++# implies no first map entry
++>>>>>>>3	uleshort		0
++>>>>>>>>0	use		tga-image
+ #	display tga bitmap image information
+ 0	name				tga-image
+ >2	ubyte		<34		Targa image data
diff --git a/file.changes b/file.changes
index b29bb40..15f023f 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  5 18:48:22 UTC 2017 - coolo@suse.com
+
+- add file-5.31-fix-tga.dif upstream commited after I reported
+  a failure in File::Unpack's test suite
+
 -------------------------------------------------------------------
 Wed May 24 10:54:28 UTC 2017 - werner@suse.de
 
diff --git a/file.spec b/file.spec
index 89d6c27..c5fbebe 100644
--- a/file.spec
+++ b/file.spec
@@ -64,6 +64,7 @@ Patch35:        file-5.24-nitpick.dif
 Patch36:        file-5.15-clear-invalid.patch
 Patch37:        file-secure_getenv.patch
 Patch39:        file-5.28-btrfs-image.dif
+Patch40:        file-5.31-fix-tga.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@@ -132,6 +133,7 @@ to develop applications that require the magic "file" interface.
 %patch36 -p1 -b .clear
 %patch37 -p1 -b .getenv
 %patch39 -p1 -b .btrfs
+%patch40 -p1 -b .tga
 %patch -b .0
 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
 rm -fv src/magic.h