diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec
index 044c050..d364ab2 100644
--- a/perl-DBD-MySQL.spec
+++ b/perl-DBD-MySQL.spec
@@ -1,62 +1,75 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-DBD-MySQL
+Version:        2.9006
+Release:        1
+Summary:        A MySQL interface for perl
 
-Summary: A MySQL interface for perl
-Name: perl-DBD-MySQL
-Version: 2.9004
-Release: 5
-License: distributable
-Group: Applications/Databases
-Source: DBD-mysql-%{version}.tar.gz
-Source2: filter-requires-dbdmysql.sh
-Url: http://search.cpan.org/search?query=DBD%3A%3AMySQL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: perl, perl-DBI
-BuildRequires: mysql-devel, mysql, perl, perl-DBI, zlib-devel
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/DBD-mysql/
+Source0:   http://www.cpan.org/authors/id/R/RU/RUDY/DBD-mysql-%{version}.tar.gz
+Source1:        filter-requires-dbdmysql.sh
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(DBI)
+BuildRequires:  mysql, mysql-devel, zlib-devel
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Provides:       perl-DBD-mysql = %{version}
+
+%define __perl_requires %{SOURCE1}
 
 %description 
 An implementation of DBI for MySQL for Perl.
 
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-# %%define __find_requires /usr/lib/rpm/find-requires.perl
-%define __find_requires %{SOURCE2}
 
 %prep
-%setup -q -n DBD-mysql-%{version} 
+%setup -q -n DBD-mysql-%{version}
+# Correct file permissions
+find . -name "*.pm" -exec chmod 644 {} ';'
+chmod 644 ChangeLog INSTALL.html README lib/DBD/mysql/INSTALL.pod
+
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL   PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor --ssl
-make
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor --ssl
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
-%clean 
-rm -rf $RPM_BUILD_ROOT
 
 %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 f -name '*.bs' -empty -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/DBD::mysql.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 {} \;
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-        sed "s@^$RPM_BUILD_ROOT@@g" | \
-        grep -v perllocal.pod | \
-        grep -v "\.packlist" > %{name}-%{version}-filelist
-if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%check || :
+# Full test coverage requires a live MySQL database
+# make test
 
-%files -f %{name}-%{version}-filelist
-%defattr(-,root,root)
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog INSTALL.html README TODO
+%{perl_vendorarch}/Bundle/
+%{perl_vendorarch}/DBD/
+%{perl_vendorarch}/Mysql*
+%{perl_vendorarch}/auto/DBD/
+%{_mandir}/man3/*.3*
 
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Thu Apr 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.9006-1
+- Update to 2.9006.
+- Specfile cleanup. (#154755)
 
 * Thu Nov 25 2004 Miloslav Trmac <mitr@redhat.com> - 2.9004-4
 - Convert man page to UTF-8