diff --git a/perl-PPI.spec b/perl-PPI.spec
index 3535760..8dc98cb 100644
--- a/perl-PPI.spec
+++ b/perl-PPI.spec
@@ -1,14 +1,12 @@
 Name:           perl-PPI
 Version:        1.206
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/PPI/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # Perl core modules
@@ -22,12 +20,13 @@ BuildRequires:  perl(File::Remove) >= 1.42
 BuildRequires:  perl(IO::String) >= 1.07
 BuildRequires:  perl(List::MoreUtils) >= 0.16
 BuildRequires:  perl(Params::Util) >= 1.00
+BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(Test::ClassAPI) >= 1.04
-BuildRequires:  perl(Test::NoWarnings) >= 0.084
+BuildRequires:  perl(Test::CPAN::Meta)
 BuildRequires:  perl(Test::Object) >= 0.07
+BuildRequires:  perl(Test::NoWarnings) >= 0.084
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::SubCalls) >= 1.07
-BuildRequires:  perl(Task::Weaken)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -36,7 +35,6 @@ Parse, Analyze and Manipulate Perl (without perl).
 
 %prep
 %setup -q -n PPI-%{version}
-
 %{?filter_setup:
 %filter_from_provides /^perl(PPI::.*)$/d
 %?perl_default_filter
@@ -45,6 +43,7 @@ iconv -f iso8859-1 -t utf-8 < Changes > Changes.1
 mv Changes.1 Changes 
 chmod -c 644 lib/PPI/Document/File.pm
 
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -52,14 +51,14 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$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/*
+chmod -R u+w $RPM_BUILD_ROOT
 
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 
 %clean
@@ -69,11 +68,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README inline2test.conf inline2test.tpl
-%{perl_vendorlib}/PPI*
-%{_mandir}/man3/*.3pm*
+%{perl_vendorlib}/PPI/
+%{perl_vendorlib}/PPI.pm
+%{_mandir}/man3/PPI*.3pm*
 
 
 %changelog
+* Fri Jul 30 2010 Paul Howarth <paul@city-fan.org> - 1.206-6
+- BR: perl(Task::Weaken) and perl(Test::CPAN::Meta) for improved test coverage
+- enable AUTOMATED_TESTING
+- use DESTDIR rather than PERL_INSTALL_ROOT
+
 * Thu May 06 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.206-5
 - Mass rebuild with perl-5.12.0