diff --git a/shared-mime-info-msi-no-magic.patch b/shared-mime-info-msi-no-magic.patch
new file mode 100644
index 0000000..eb7bd41
--- /dev/null
+++ b/shared-mime-info-msi-no-magic.patch
@@ -0,0 +1,12 @@
+--- freedesktop.org.xml.in
++++ freedesktop.org.xml.in
+@@ -2133,9 +2133,6 @@
+   <mime-type type="application/x-msi">
+     <_comment>Windows Installer package</_comment>
+     <sub-class-of type="application/x-ole-storage"/>
+-    <magic priority="50">
+-      <match type="string" value="\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF\x09\x00\x06" offset="0" />
+-    </magic>
+     <glob pattern="*.msi"/>
+   </mime-type>
+   <mime-type type="application/x-oleo">
diff --git a/shared-mime-info.changes b/shared-mime-info.changes
index 59d3733..30cd51c 100644
--- a/shared-mime-info.changes
+++ b/shared-mime-info.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 15 14:38:52 CEST 2008 - sbrabec@suse.cz
+
+- Prevent OLE containers to be recognized as Windows Installer
+  package (bnc#430389, fdo#18072).
+
 -------------------------------------------------------------------
 Wed Aug 20 12:51:12 CEST 2008 - sbrabec@suse.cz
 
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index f01c383..11d31b4 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -21,13 +21,15 @@
 Name:           shared-mime-info
 BuildRequires:  glib2-devel intltool libxml2-devel perl-XML-Parser
 Version:        0.51
-Release:        1
+Release:        12
 Url:            http://freedesktop.org/wiki/Software/shared-mime-info
 Group:          System/X11/Utilities
 License:        GPL v2 or later
 Summary:        Shared MIME Database
 Source:         %{name}-%{version}.tar.bz2
 Source1:        mime-info-to-mime
+# PATCH-FIX-UPSTREAM shared-mime-info-msi-no-magic.patch bnc#430389 fdo#18072 sbrabec@suse.cz -- Prevent OLE files to be recognized as MSI.
+Patch:          shared-mime-info-msi-no-magic.patch
 # needed by mime-info-to-mime:
 Requires:       /bin/rm /bin/mkdir /usr/bin/fgrep
 # needed by update-mime-database
@@ -51,6 +53,7 @@ Authors:
 
 %prep
 %setup -q
+%patch
 
 %build
 %configure
@@ -77,6 +80,9 @@ usr/bin/update-mime-database usr/share/mime >/dev/null
 %{_mandir}/man?/*.*
 
 %changelog
+* Wed Oct 15 2008 sbrabec@suse.cz
+- Prevent OLE containers to be recognized as Windows Installer
+  package (bnc#430389, fdo#18072).
 * Wed Aug 20 2008 sbrabec@suse.cz
 - Updated to version 0.51:
   * many new MIME types recognized