diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec
index b753318..9616f66 100644
--- a/perl-libwww-perl.spec
+++ b/perl-libwww-perl.spec
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.808
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -18,10 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Entities), perl(URI), perl(Test::More), perl(ExtUtils::MakeMaker)
+BuildRequires:  mailcap
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Compress::Zlib)
 Requires:       perl-HTML-Parser >= 3.33
-
+Requires:       mailcap
 
 %description
 The libwww-perl collection is a set of Perl modules which provides a
@@ -79,6 +80,14 @@ for file in $RPM_BUILD_ROOT%{_mandir}/man3/LWP.3pm AUTHORS README Changes; do
   mv -f "${file}_" "$file"
 done
 
+# Use system wide MIME types (link also to blib/... for "make test").  Doing
+# this stuff before "make install" would not cause the symlink to be packaged
+# but a copy of /etc/mime.types.
+for file in {blib/lib,$RPM_BUILD_ROOT%{perl_vendorlib}}/LWP/media.types ; do
+  [ ! -f $file ] && echo ERROR && exit 1
+  ln -sf /etc/mime.types $file
+done
+
 %check
 make test
 
@@ -105,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 5.808-7
+- Use system /etc/mime.types instead of an outdated private copy.
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 5.808-6
 - Rebuild for perl 5.10 (again)