diff --git a/Module-Info-0.31.tar.bz2 b/Module-Info-0.31.tar.bz2
new file mode 100644
index 0000000..0268f5a
--- /dev/null
+++ b/Module-Info-0.31.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67f63ecca7d44fd5ce8c2d072fdfe77371426350ca05dd199e2ef26b2357c65b
+size 39246
diff --git a/Module-Info-0.31.tar.gz b/Module-Info-0.31.tar.gz
deleted file mode 100644
index f77018f..0000000
--- a/Module-Info-0.31.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:812f6439f8fc7b176585fd2ff8cbe26323b24626e8d42337fe004fd099566711
-size 45047
diff --git a/perl-Module-Info.changes b/perl-Module-Info.changes
index 24128ce..aeb45bc 100644
--- a/perl-Module-Info.changes
+++ b/perl-Module-Info.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 22 23:55:32 UTC 2010 - chris@computersalat.de
+
+- cleanup spec
+  o bzipped Source
+  o added cpan_name macro
+  o sort TAGS
+  o fixed deps
+  o added perl-macros
+  o added check
+
 -------------------------------------------------------------------
 Sun Jan 10 15:43:32 CET 2010 - jengelh@medozas.de
 
diff --git a/perl-Module-Info.spec b/perl-Module-Info.spec
index 9266a6e..a5c4a0a 100644
--- a/perl-Module-Info.spec
+++ b/perl-Module-Info.spec
@@ -19,16 +19,24 @@
 
 
 Name:           perl-Module-Info
-Url:            http://search.cpan.org/~mbarbon/Module-Info/
-License:        Artistic
-Group:          Development/Languages/Perl
-Requires:       perl = %{perl_version}
-AutoReqProv:    on
+%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' )
 Summary:        Information about Perl modules
 Version:        0.31
-Release:        76
-Source:         Module-Info-%{version}.tar.gz
+Release:        77
+License:        Artistic
+Group:          Development/Languages/Perl
+Url:            http://search.cpan.org/dist/Module-Info/
+Source:         %{cpan_name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  perl
+BuildRequires:  perl-macros
+BuildRequires:  perl(Test::Pod) >= 1.00
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.00
+#
+BuildRequires:  perl(File::Spec) >= 0.08
+Requires:       perl = %{perl_version}
+Requires:       perl(File::Spec) >= 0.08
+Provides:       %{cpan_name}
 
 %description
 Module::Info gives you information about Perl modules without actually
@@ -42,41 +50,25 @@ Authors:
     Mattia Barbon <mbarbon@users.sourceforge.net>
 
 %prep
-%setup -n Module-Info-%{version}
-# ---------------------------------------------------------------------------
+%setup -n %{cpan_name}-%{version}
 
 %build
-perl Makefile.PL
-make %{?_smp_mflags}
-# ---------------------------------------------------------------------------
+perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
+%{__make} %{?_smp_mflags}
+
+%check
+%{__make} test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+%perl_make_install
 %perl_process_packlist
+%perl_gen_filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.files
 %defattr(-,root,root)
-%doc MANIFEST
-/usr/bin/module_info
-/usr/bin/pfunc
-%dir %{perl_vendorlib}/B
-%dir %{perl_vendorlib}/B/Module
-%dir %{perl_vendorlib}/Module
-%dir %{perl_vendorarch}/auto/Module
-%dir %{perl_vendorarch}/auto/Module/Info
-%{perl_vendorlib}/B/Module/Info.pm
-%{perl_vendorlib}/B/BUtils.pm
-%{perl_vendorlib}/Module/Info.pm
-%{perl_vendorarch}/auto/Module/Info/.packlist
-%doc %{_mandir}/man?/module_info.1.gz
-%doc %{_mandir}/man?/pfunc.1.gz
-%doc %{_mandir}/man?/B::BUtils.3pm.gz
-%doc %{_mandir}/man?/Module::Info.3pm.gz
-%doc %{_mandir}/man?/B::Module::Info.3pm.gz
-/var/adm/perl-modules/%{name}
+%doc Changes
 
 %changelog