diff --git a/file-5.04-html-regression.patch b/file-5.04-html-regression.patch
new file mode 100644
index 0000000..9be36c9
--- /dev/null
+++ b/file-5.04-html-regression.patch
@@ -0,0 +1,44 @@
+diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
+index 0a57375..1dceba5 100644
+--- a/magic/Magdir/sgml
++++ b/magic/Magdir/sgml
+@@ -34,21 +34,13 @@
+ # HyperText Markup Language (HTML) is an SGML document type,
+ # from Daniel Quinlan (quinlan@yggdrasil.com)
+ # adapted to string extenstions by Anthon van der Neut 0 ubyte 0 (false match)
+->0 ubyte >0 (Z-machine %d,
+->>2 ubeshort x Release %d /
+->>18 string >\0 Serial %.6s)
++# The first byte is the Z-machine version number, which is always between
++# 1 and 8.
++0 ubyte >0
++>0 ubyte <9
++>>16 belong&0xfe00f0f0 0x3030 Infocom game data
++>>>0 ubyte >0 (Z-machine %d,
++>>>>2 ubeshort x Release %d /
++>>>>18 string >\0 Serial %.6s)
+
+ #------------------------------------------------------------------------------
+ # Glulx: file(1) magic for Glulx binaries.
diff --git a/file.spec b/file.spec
index 1e65089..6a510ed 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.04
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -16,6 +16,8 @@ Patch2: file-5.00-mdmp.patch
Patch3: file-5.04-ulaw-segfault.patch
Patch4: file-5.04-ruby-modules.patch
Patch5: file-5.04-core-trim.patch
+Patch6: file-5.04-html-regression.patch
+Patch7: file-5.04-zmachine-magic-update.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +81,8 @@ file(1) command.
%patch4 -p1
#fixes #566305
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@@ -155,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jul 01 2010 Jan Kaluza 5.04-5
+- fix #608922 - updated z-machine magic
+- fix #610067 - removed excessive HTML/SGML "magic patterns"
+
* Thu May 27 2010 Daniel Novotny 5.04-4
- fix #566305 - "file" may trim too much of command line from core file