diff --git a/.gitignore b/.gitignore
index de1bc4b..564b8c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Parse-CPAN-Packages-2.31.tar.gz
-/Parse-CPAN-Packages-2.33.tar.gz
+/Parse-CPAN-Packages-[0-9.]*.tar.gz
diff --git a/Parse-CPAN-Packages-2.38-Test::InDistDir.patch b/Parse-CPAN-Packages-2.38-Test::InDistDir.patch
new file mode 100644
index 0000000..8ecdb08
--- /dev/null
+++ b/Parse-CPAN-Packages-2.38-Test::InDistDir.patch
@@ -0,0 +1,39 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -18,7 +18,6 @@ WriteMakefile(
+           Moose
+           Path::Class
+           PPI
+-          Test::InDistDir
+           Test::More
+           version
+           )
+--- META.json
++++ META.json
+@@ -39,7 +39,6 @@
+             "Moose" : "0",
+             "PPI" : "0",
+             "Path::Class" : "0",
+-            "Test::InDistDir" : "0",
+             "Test::More" : "0",
+             "version" : "0"
+          }
+--- META.yml
++++ META.yml
+@@ -25,7 +25,6 @@ requires:
+   Moose: '0'
+   PPI: '0'
+   Path::Class: '0'
+-  Test::InDistDir: '0'
+   Test::More: '0'
+   version: '0'
+ version: '2.38'
+--- t/simple.t
++++ t/simple.t
+@@ -1,6 +1,5 @@
+ #!/usr/bin/perl
+ use strict;
+-use Test::InDistDir;
+ use Test::More;
+ use File::Slurp 'read_file';
+ 
diff --git a/perl-Parse-CPAN-Packages.spec b/perl-Parse-CPAN-Packages.spec
index 08c78ed..7ab1660 100644
--- a/perl-Parse-CPAN-Packages.spec
+++ b/perl-Parse-CPAN-Packages.spec
@@ -1,22 +1,31 @@
 Name:           perl-Parse-CPAN-Packages
-Version:        2.33
-Release:        11%{?dist}
+Version:        2.38
+Release:        1%{?dist}
 Summary:        Parse 02packages.details.txt.gz
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Packages/
 Source0:        http://www.cpan.org/authors/id/M/MI/MITHALDU/Parse-CPAN-Packages-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         Parse-CPAN-Packages-2.38-Test::InDistDir.patch
 BuildArch:      noarch
+# Module Build
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Module Runtime
+BuildRequires:  perl(Archive::Peek)
 BuildRequires:  perl(Compress::Zlib)
 BuildRequires:  perl(CPAN::DistnameInfo)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Slurp)
 BuildRequires:  perl(Moose)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Path::Class)
+BuildRequires:  perl(PPI)
 BuildRequires:  perl(version)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Test Suite
+# perl(Test::InDistDir) dependency patched out
+BuildRequires:  perl(Test::More)
+# Runtime
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 The Comprehensive Perl Archive Network (CPAN) is a very useful collection
@@ -28,33 +37,49 @@ interface to the data contained within.
 %prep
 %setup -q -n Parse-CPAN-Packages-%{version}
 
+# Remove the need for (so-far unpackaged) Test::InDistDir
+%patch0
+
+# Strip spurious exec permissions
+find . -type f -exec chmod -c -x {} \;
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 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 -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGES README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Parse/
+%{_mandir}/man3/Parse::CPAN::Packages.3pm*
+%{_mandir}/man3/Parse::CPAN::Packages::Distribution.3pm*
+%{_mandir}/man3/Parse::CPAN::Packages::Package.3pm*
 
 %changelog
+* Thu Oct 17 2013 Paul Howarth <paul@city-fan.org> - 2.38-1
+- Update to 2.38
+  - Added methods to the generated objects to try to retrieve dist contents
+    from a local cpan mirror
+  - Some refactoring/cleanup
+  - Added rudimentary logic to return the subs in a package, as well as verify
+    via regex whether a given sub is in the package
+  - Moved author tests to xt/ to avoid them being run on the user side
+  - Removed some dependency on hash ordering in the tests
+- Classify buildreqs by usage
+- Don't use macros for commands
+- Don't need to remove empty directories from the buildroot
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Drop EL-5 support as dependencies can't be met there
+- Make %%files list more explicit
+- Patch out Test::InDistDir dependency, only needed to support upstream's IDE
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.33-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -90,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update Source0 URL.
 
 * Tue Dec 21 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.31-5
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Tue May 04 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.31-4
 - Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index 7829298..74af9d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-baac1b04c87bc7d24770ce2019494cae  Parse-CPAN-Packages-2.33.tar.gz
+a4a7956f364839b2f69d60af9bf1957c  Parse-CPAN-Packages-2.38.tar.gz