diff --git a/.cvsignore b/.cvsignore
index 390184a..37f2c1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libwww-perl-5.79.tar.gz
+libwww-perl-5.803.tar.gz
diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec
index 31d88dc..ddd3cbb 100644
--- a/perl-libwww-perl.spec
+++ b/perl-libwww-perl.spec
@@ -1,24 +1,23 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-libwww-perl
+Version:        5.803
+Release:        1
+Summary:        A Perl interface to the World-Wide Web
 
-Summary: A Perl interface to the World-Wide Web.
-Name: perl-libwww-perl
-Version: 5.79
-Release: 7
-License: GPL or Artistic
-Group: Applications/CPAN
-Source0: libwww-perl-%{version}.tar.gz
-Source10: filter-depends.sh
-URL: http://search.cpan.org/dist/libwww-perl/
-BuildRoot: %{_tmppath}/perl-libwww-perl-buildroot/
-BuildRequires: perl >= 0:5.00503
-Requires: perl >= 0:5.00503
-Requires: perl(URI) perl(Digest::MD5)
-Requires: perl-HTML-Parser >= 0:3.33
-Requires: perl(HTML::Entities)
-BuildRequires: perl(MIME::Base64)
-BuildRequires: perl(HTML::Entities)
-Requires: perl-HTML-Parser >= 0:3.33
-BuildArch: noarch
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/libwww-perl/
+Source0: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
+Source10:       filter-depends.sh
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(HTML::Entities), perl(URI)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Compress::Zlib)
+Requires:       perl-HTML-Parser >= 3.33
+
+%define __perl_requires %{SOURCE10}
 
 %description
 The libwww-perl collection is a set of Perl modules which provides a
@@ -29,54 +28,54 @@ contain modules that are of more general use and even classes that
 help you implement simple HTTP servers.
 
 
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires %{SOURCE10}
-
 %prep
 %setup -q -n libwww-perl-%{version} 
+# Install the aliases by default
+%{__perl} -pi -e 's|my \$default = "n";|my \$default = "y";|' Makefile.PL
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INST_EXE=$RPM_BUILD_ROOT/usr/bin PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null
-make
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
+%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
 file=$RPM_BUILD_ROOT%{_mandir}/man3/LWP.3pm
 iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 mv -f "${file}_" "$file"
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%check || :
+make test
 
-find $RPM_BUILD_ROOT/usr -type f -print | 
-	sed "s@^$RPM_BUILD_ROOT@@g" | 
-	grep -v perllocal.pod | 
-	grep -v "\.packlist" > libwww-perl-%{version}-filelist
-if [ "$(cat libwww-perl-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%clean 
+rm -rf $RPM_BUILD_ROOT
 
-%files -f libwww-perl-%{version}-filelist
-%defattr(-,root,root)
+
+%files
+%defattr(-,root,root,-)
 %doc AUTHORS Changes README*
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/LWP
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/Net
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/WWW
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/WWW/RobotRules
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/File
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/HTML
-%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/HTTP
+%{_bindir}/*
+%{perl_vendorlib}/lwp*.pod
+%{perl_vendorlib}/LWP.pm
+%{perl_vendorlib}/Bundle/
+%{perl_vendorlib}/File/
+%{perl_vendorlib}/HTML/
+%{perl_vendorlib}/HTTP/
+%{perl_vendorlib}/LWP/
+%{perl_vendorlib}/Net/
+%{perl_vendorlib}/WWW/
+%{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
 
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Sat Apr 02 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 5.803-1
+- Update to 5.803.
+- spec cleanup (#150363)
 
 * Thu Nov 25 2004 Miloslav Trmac <mitr@redhat.com> - 5.79-6
 - Convert man page to UTF-8
diff --git a/sources b/sources
index 46e847f..bfdf61e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6682a0a532bf0b2cf76259c94d0d8dc4  libwww-perl-5.79.tar.gz
+3345d5f15a4f42350847254141725c8f  libwww-perl-5.803.tar.gz