diff --git a/shared-mime-info-picturecd.patch b/shared-mime-info-picturecd.patch
new file mode 100644
index 0000000..e7836d8
--- /dev/null
+++ b/shared-mime-info-picturecd.patch
@@ -0,0 +1,16 @@
+Index: freedesktop.org.xml.in
+===================================================================
+RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
+retrieving revision 1.380
+diff -u -p -u -p -r1.380 freedesktop.org.xml.in
+--- freedesktop.org.xml.in	16 Oct 2008 10:24:31 -0000	1.380
++++ freedesktop.org.xml.in	29 Oct 2008 20:55:38 -0000
+@@ -4916,7 +4916,7 @@ command to generate the output files.
+          http://www.re.org/kristin/picturecd.html  -->
+     <_comment>Picture CD</_comment>
+     <treemagic>
+-      <treematch path="PICTURES" type="directory" non-empty="true"/>
++      <treematch path="PICTURES" type="directory" non-empty="true" match-case="true"/>
+     </treemagic>
+   </mime-type>
+ 
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 916e564..f21a402 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.51
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -11,6 +11,9 @@ Source1: defaults.list
 # for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q $i ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi  ; done
 Source2: totem-defaults.list
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=459365
+Patch0: shared-mime-info-picturecd.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  gawk
 BuildRequires:  libxml2-devel
@@ -30,6 +33,8 @@ and looking up the correct MIME type in a database.
 
 %prep
 %setup -q
+%patch0 -p0 -b .picturecd
+
 %build
 
 %configure --disable-update-mimedb
@@ -63,6 +68,10 @@ cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 %{_mandir}/man*/*
 
 %changelog
+* Wed Oct 29 2008 - Bastien Nocera <bnocera@redhat.com> - 0.51-4
+- Add patch to avoid picture CD being anything with a pictures directory
+  (#459365)
+
 * Thu Oct 02 2008 - Bastien Nocera <bnocera@redhat.com> - 0.51-3
 - Use evince, not tetex-xdvi.desktop for DVI files (#465242)