99 files changed, 147 insertions, 411 deletions
diff --git a/MANIFEST b/MANIFEST
index e736a314c2..76f078d834 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -257,6 +257,9 @@ ext/Compress-Raw-Zlib/zlib-src/zlib.h	Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/zlib-src/zutil.c	Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/zlib-src/zutil.h  Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/Zlib.xs		Compress::Raw::Zlib
+ext/CPANPLUS/bin/cpan2dist	the cpan2dist utility
+ext/CPANPLUS/bin/cpanp	the cpanp utility
+ext/CPANPLUS/bin/cpanp-run-perl	the cpanp-run-perl utility
 ext/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm	CPANPLUS::Dist::Build
 ext/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm	CPANPLUS::Dist::Build
 ext/CPANPLUS-Dist-Build/t/01_CPANPLUS-Dist-Build-Constants.t	CPANPLUS::Dist::Build tests
@@ -268,6 +271,86 @@ ext/CPANPLUS-Dist-Build/t/dummy-perl/.hidden  CPANPLUS::Dist::Build tests
 ext/CPANPLUS-Dist-Build/t/inc/conf.pl CPANPLUS::Dist::Build tests
 ext/CPANPLUS-Dist-Build/t/src/noxs/Foo-Bar-0.01.tar.gz  CPANPLUS::Dist::Build tests
 ext/CPANPLUS-Dist-Build/t/src/xs/Foo-Bar-0.01.tar.gz  CPANPLUS::Dist::Build tests
+ext/CPANPLUS/lib/CPANPLUS/Backend.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Backend/RV.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Config.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Configure.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Configure/Setup.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Dist/Autobundle.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Dist/Base.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Dist/MM.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Dist.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Dist/Sample.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Error.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/FAQ.pod	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Hacking.pod	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Fetch.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Report.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Search.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Source/Memory.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Source.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite/Tie.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Utils/Autoflush.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module/Author.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module/Checksums.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module/Fake.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Module/Signature.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Selfupdate.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Classic.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Source.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell/Default.pm	CPANPLUS
+ext/CPANPLUS/lib/CPANPLUS/Shell.pm	CPANPLUS
+ext/CPANPLUS/Makefile.PL
+ext/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t	CPANPLUS tests
+ext/CPANPLUS/t/01_CPANPLUS-Configure.t	CPANPLUS tests
+ext/CPANPLUS/t/02_CPANPLUS-Internals.t	CPANPLUS tests
+ext/CPANPLUS/t/03_CPANPLUS-Internals-Source.t	CPANPLUS tests
+ext/CPANPLUS/t/04_CPANPLUS-Module.t	CPANPLUS tests
+ext/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t	CPANPLUS tests
+ext/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t	CPANPLUS tests
+ext/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t	CPANPLUS tests
+ext/CPANPLUS/t/08_CPANPLUS-Backend.t	CPANPLUS tests
+ext/CPANPLUS/t/09_CPANPLUS-Internals-Search.t	CPANPLUS tests
+ext/CPANPLUS/t/10_CPANPLUS-Error.t	CPANPLUS tests
+ext/CPANPLUS/t/15_CPANPLUS-Shell.t	CPANPLUS tests
+ext/CPANPLUS/t/19_CPANPLUS-Dist.t	CPANPLUS tests
+ext/CPANPLUS/t/20_CPANPLUS-Dist-MM.t	CPANPLUS tests
+ext/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t	CPANPLUS tests
+ext/CPANPLUS/t/25_CPANPLUS.t	CPANPLUS tests
+ext/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t	CPANPLUS tests
+ext/CPANPLUS/t/40_CPANPLUS-Internals-Report.t	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz	CPANPLUS tests
+ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz CPANPLUS tests
+ext/CPANPLUS/t/inc/conf.pl	CPANPLUS tests
 ext/Cwd/Changes			Cwd extension Changelog
 ext/Cwd/Cwd.xs			Cwd extension external subroutines
 ext/Cwd/Makefile.PL		Cwd extension makefile maker
@@ -2280,88 +2363,6 @@ lib/CPAN/PAUSE2003.pub		CPAN public key
 lib/CPAN/PAUSE2005.pub		CPAN public key
 lib/CPAN/PAUSE2007.pub		CPAN public key
 lib/CPAN/PAUSE2009.pub		CPAN public key
-lib/CPANPLUS/Backend.pm	CPANPLUS
-lib/CPANPLUS/Backend/RV.pm	CPANPLUS
-lib/CPANPLUS/bin/cpan2dist	the cpan2dist utility
-lib/CPANPLUS/bin/cpanp	the cpanp utility
-lib/CPANPLUS/bin/cpanp-run-perl	the cpanp-run-perl utility
-lib/CPANPLUS/Config.pm	CPANPLUS
-lib/CPANPLUS/Configure.pm	CPANPLUS
-lib/CPANPLUS/Configure/Setup.pm	CPANPLUS
-lib/CPANPLUS/Dist/Autobundle.pm	CPANPLUS
-lib/CPANPLUS/Dist/Base.pm	CPANPLUS
-lib/CPANPLUS/Dist/MM.pm	CPANPLUS
-lib/CPANPLUS/Dist.pm	CPANPLUS
-lib/CPANPLUS/Dist/Sample.pm	CPANPLUS
-lib/CPANPLUS/Error.pm	CPANPLUS
-lib/CPANPLUS/FAQ.pod	CPANPLUS
-lib/CPANPLUS/Hacking.pod	CPANPLUS
-lib/CPANPLUS/Internals/Constants.pm	CPANPLUS
-lib/CPANPLUS/Internals/Constants/Report.pm	CPANPLUS
-lib/CPANPLUS/Internals/Extract.pm	CPANPLUS
-lib/CPANPLUS/Internals/Fetch.pm	CPANPLUS
-lib/CPANPLUS/Internals.pm	CPANPLUS
-lib/CPANPLUS/Internals/Report.pm	CPANPLUS
-lib/CPANPLUS/Internals/Search.pm	CPANPLUS
-lib/CPANPLUS/Internals/Source/Memory.pm	CPANPLUS
-lib/CPANPLUS/Internals/Source.pm	CPANPLUS
-lib/CPANPLUS/Internals/Source/SQLite.pm	CPANPLUS
-lib/CPANPLUS/Internals/Source/SQLite/Tie.pm	CPANPLUS
-lib/CPANPLUS/Internals/Utils/Autoflush.pm	CPANPLUS
-lib/CPANPLUS/Internals/Utils.pm	CPANPLUS
-lib/CPANPLUS/Module/Author/Fake.pm	CPANPLUS
-lib/CPANPLUS/Module/Author.pm	CPANPLUS
-lib/CPANPLUS/Module/Checksums.pm	CPANPLUS
-lib/CPANPLUS/Module/Fake.pm	CPANPLUS
-lib/CPANPLUS/Module.pm	CPANPLUS
-lib/CPANPLUS/Module/Signature.pm	CPANPLUS
-lib/CPANPLUS.pm	CPANPLUS
-lib/CPANPLUS/Selfupdate.pm	CPANPLUS
-lib/CPANPLUS/Shell/Classic.pm	CPANPLUS
-lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm	CPANPLUS
-lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod	CPANPLUS
-lib/CPANPLUS/Shell/Default/Plugins/Remote.pm	CPANPLUS
-lib/CPANPLUS/Shell/Default/Plugins/Source.pm	CPANPLUS
-lib/CPANPLUS/Shell/Default.pm	CPANPLUS
-lib/CPANPLUS/Shell.pm	CPANPLUS
-lib/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t	CPANPLUS tests
-lib/CPANPLUS/t/01_CPANPLUS-Configure.t	CPANPLUS tests
-lib/CPANPLUS/t/02_CPANPLUS-Internals.t	CPANPLUS tests
-lib/CPANPLUS/t/03_CPANPLUS-Internals-Source.t	CPANPLUS tests
-lib/CPANPLUS/t/04_CPANPLUS-Module.t	CPANPLUS tests
-lib/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t	CPANPLUS tests
-lib/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t	CPANPLUS tests
-lib/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t	CPANPLUS tests
-lib/CPANPLUS/t/08_CPANPLUS-Backend.t	CPANPLUS tests
-lib/CPANPLUS/t/09_CPANPLUS-Internals-Search.t	CPANPLUS tests
-lib/CPANPLUS/t/10_CPANPLUS-Error.t	CPANPLUS tests
-lib/CPANPLUS/t/15_CPANPLUS-Shell.t	CPANPLUS tests
-lib/CPANPLUS/t/19_CPANPLUS-Dist.t	CPANPLUS tests
-lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t	CPANPLUS tests
-lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t	CPANPLUS tests
-lib/CPANPLUS/t/25_CPANPLUS.t	CPANPLUS tests
-lib/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t	CPANPLUS tests
-lib/CPANPLUS/t/40_CPANPLUS-Internals-Report.t	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed	CPANPLUS tests
-lib/CPANPLUS/t/inc/conf.pl	CPANPLUS tests
 lib/CPAN.pm			Interface to Comprehensive Perl Archive Network
 lib/CPAN/Prompt.pm
 lib/CPAN/Queue.pm		queueing system for CPAN.pm
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index d00b66598d..f261369d35 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -433,31 +433,7 @@ package Maintainers;
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/CPANPLUS-0.88.tar.gz',
-	'FILES'		=> q[lib/CPANPLUS.pm
-			     lib/CPANPLUS/Backend
-			     lib/CPANPLUS/Backend.pm
-			     lib/CPANPLUS/bin
-			     lib/CPANPLUS/Config.pm
-			     lib/CPANPLUS/Configure
-			     lib/CPANPLUS/Configure.pm
-			     lib/CPANPLUS/Error.pm
-			     lib/CPANPLUS/FAQ.pod
-			     lib/CPANPLUS/Hacking.pod
-			     lib/CPANPLUS/inc.pm
-			     lib/CPANPLUS/Internals
-			     lib/CPANPLUS/Internals.pm
-			     lib/CPANPLUS/Module
-			     lib/CPANPLUS/Module.pm
-			     lib/CPANPLUS/Selfupdate.pm
-			     lib/CPANPLUS/Shell
-			     lib/CPANPLUS/Shell.pm
-			     lib/CPANPLUS/Dist.pm
-			     lib/CPANPLUS/Dist/Base.pm
-			     lib/CPANPLUS/Dist/Autobundle.pm
-			     lib/CPANPLUS/Dist/MM.pm
-			     lib/CPANPLUS/Dist/Sample.pm
-			     lib/CPANPLUS/t
-			    ],
+	'FILES'		=> q[ext/CPANPLUS],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qr{^t/dummy-.*\.hidden$},
 			     qw{ bin/cpanp-boxed },
diff --git a/ext/CPANPLUS/Makefile.PL b/ext/CPANPLUS/Makefile.PL
new file mode 100644
index 0000000000..d69b40d9a0
--- /dev/null
+++ b/ext/CPANPLUS/Makefile.PL
@@ -0,0 +1,11 @@
+use strict;
+use ExtUtils::MakeMaker;
+
+WriteMakefile (
+    NAME            => 'CPANPLUS',
+    VERSION_FROM    => 'lib/CPANPLUS/Internals.pm', # finds $VERSION
+    EXE_FILES       => ['bin/cpan2dist','bin/cpanp','bin/cpanp-run-perl'],
+    INSTALLDIRS     => ( $] >= 5.009005 ? 'perl' : 'site' ),
+    AUTHOR          => 'Jos Boumans <kane[at]cpan.org>',
+    ABSTRACT        => 'Ameliorated interface to the CPAN'
+);
diff --git a/lib/CPANPLUS/bin/cpan2dist b/ext/CPANPLUS/bin/cpan2dist
index 5ba4556c52..5ba4556c52 100644
--- a/lib/CPANPLUS/bin/cpan2dist
+++ b/ext/CPANPLUS/bin/cpan2dist
diff --git a/lib/CPANPLUS/bin/cpanp b/ext/CPANPLUS/bin/cpanp
index a493322cc2..a493322cc2 100644
--- a/lib/CPANPLUS/bin/cpanp
+++ b/ext/CPANPLUS/bin/cpanp
diff --git a/lib/CPANPLUS/bin/cpanp-run-perl b/ext/CPANPLUS/bin/cpanp-run-perl
index 34e62bddd0..34e62bddd0 100644
--- a/lib/CPANPLUS/bin/cpanp-run-perl
+++ b/ext/CPANPLUS/bin/cpanp-run-perl
diff --git a/lib/CPANPLUS.pm b/ext/CPANPLUS/lib/CPANPLUS.pm
index 8ef35950cf..8ef35950cf 100644
--- a/lib/CPANPLUS.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS.pm
diff --git a/lib/CPANPLUS/Backend.pm b/ext/CPANPLUS/lib/CPANPLUS/Backend.pm
index 24336f41b6..24336f41b6 100644
--- a/lib/CPANPLUS/Backend.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Backend.pm
diff --git a/lib/CPANPLUS/Backend/RV.pm b/ext/CPANPLUS/lib/CPANPLUS/Backend/RV.pm
index 9edbe0452c..9edbe0452c 100644
--- a/lib/CPANPLUS/Backend/RV.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Backend/RV.pm
diff --git a/lib/CPANPLUS/Config.pm b/ext/CPANPLUS/lib/CPANPLUS/Config.pm
index 28f4fb6ef0..28f4fb6ef0 100644
--- a/lib/CPANPLUS/Config.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Config.pm
diff --git a/lib/CPANPLUS/Configure.pm b/ext/CPANPLUS/lib/CPANPLUS/Configure.pm
index 2d249e541d..2d249e541d 100644
--- a/lib/CPANPLUS/Configure.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Configure.pm
diff --git a/lib/CPANPLUS/Configure/Setup.pm b/ext/CPANPLUS/lib/CPANPLUS/Configure/Setup.pm
index 3bcf8f4509..3bcf8f4509 100644
--- a/lib/CPANPLUS/Configure/Setup.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Configure/Setup.pm
diff --git a/lib/CPANPLUS/Dist.pm b/ext/CPANPLUS/lib/CPANPLUS/Dist.pm
index 4bbbd1d15a..4bbbd1d15a 100644
--- a/lib/CPANPLUS/Dist.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Dist.pm
diff --git a/lib/CPANPLUS/Dist/Autobundle.pm b/ext/CPANPLUS/lib/CPANPLUS/Dist/Autobundle.pm
index 16638b258f..16638b258f 100644
--- a/lib/CPANPLUS/Dist/Autobundle.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Dist/Autobundle.pm
diff --git a/lib/CPANPLUS/Dist/Base.pm b/ext/CPANPLUS/lib/CPANPLUS/Dist/Base.pm
index c7108ed139..c7108ed139 100644
--- a/lib/CPANPLUS/Dist/Base.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Dist/Base.pm
diff --git a/lib/CPANPLUS/Dist/MM.pm b/ext/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
index 262c83be52..262c83be52 100644
--- a/lib/CPANPLUS/Dist/MM.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
diff --git a/lib/CPANPLUS/Dist/Sample.pm b/ext/CPANPLUS/lib/CPANPLUS/Dist/Sample.pm
index 0b0939208f..0b0939208f 100644
--- a/lib/CPANPLUS/Dist/Sample.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Dist/Sample.pm
diff --git a/lib/CPANPLUS/Error.pm b/ext/CPANPLUS/lib/CPANPLUS/Error.pm
index 38710a8a85..38710a8a85 100644
--- a/lib/CPANPLUS/Error.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Error.pm
diff --git a/lib/CPANPLUS/FAQ.pod b/ext/CPANPLUS/lib/CPANPLUS/FAQ.pod
index 82bb57aaf4..82bb57aaf4 100644
--- a/lib/CPANPLUS/FAQ.pod
+++ b/ext/CPANPLUS/lib/CPANPLUS/FAQ.pod
diff --git a/lib/CPANPLUS/Hacking.pod b/ext/CPANPLUS/lib/CPANPLUS/Hacking.pod
index 1a28b9e5b0..1a28b9e5b0 100644
--- a/lib/CPANPLUS/Hacking.pod
+++ b/ext/CPANPLUS/lib/CPANPLUS/Hacking.pod
diff --git a/lib/CPANPLUS/Internals.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals.pm
index 3df48c8d32..3df48c8d32 100644
--- a/lib/CPANPLUS/Internals.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals.pm
diff --git a/lib/CPANPLUS/Internals/Constants.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
index 1d05c98fe4..1d05c98fe4 100644
--- a/lib/CPANPLUS/Internals/Constants.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
diff --git a/lib/CPANPLUS/Internals/Constants/Report.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm
index da46f55e64..da46f55e64 100644
--- a/lib/CPANPLUS/Internals/Constants/Report.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm
diff --git a/lib/CPANPLUS/Internals/Extract.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm
index 84a48a50de..84a48a50de 100644
--- a/lib/CPANPLUS/Internals/Extract.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Extract.pm
diff --git a/lib/CPANPLUS/Internals/Fetch.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Fetch.pm
index 395965bab6..395965bab6 100644
--- a/lib/CPANPLUS/Internals/Fetch.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Fetch.pm
diff --git a/lib/CPANPLUS/Internals/Report.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
index 2e793d3570..2e793d3570 100644
--- a/lib/CPANPLUS/Internals/Report.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
diff --git a/lib/CPANPLUS/Internals/Search.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Search.pm
index 63c4da64d9..63c4da64d9 100644
--- a/lib/CPANPLUS/Internals/Search.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Search.pm
diff --git a/lib/CPANPLUS/Internals/Source.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
index 1d4a2d3613..1d4a2d3613 100644
--- a/lib/CPANPLUS/Internals/Source.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
diff --git a/lib/CPANPLUS/Internals/Source/Memory.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/Memory.pm
index cb3fd4f1e7..cb3fd4f1e7 100644
--- a/lib/CPANPLUS/Internals/Source/Memory.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/Memory.pm
diff --git a/lib/CPANPLUS/Internals/Source/SQLite.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm
index 71d33b805c..71d33b805c 100644
--- a/lib/CPANPLUS/Internals/Source/SQLite.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite.pm
diff --git a/lib/CPANPLUS/Internals/Source/SQLite/Tie.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite/Tie.pm
index f908c9803e..f908c9803e 100644
--- a/lib/CPANPLUS/Internals/Source/SQLite/Tie.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Source/SQLite/Tie.pm
diff --git a/lib/CPANPLUS/Internals/Utils.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
index d79320cf49..d79320cf49 100644
--- a/lib/CPANPLUS/Internals/Utils.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
diff --git a/lib/CPANPLUS/Internals/Utils/Autoflush.pm b/ext/CPANPLUS/lib/CPANPLUS/Internals/Utils/Autoflush.pm
index 56566436a1..56566436a1 100644
--- a/lib/CPANPLUS/Internals/Utils/Autoflush.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Internals/Utils/Autoflush.pm
diff --git a/lib/CPANPLUS/Module.pm b/ext/CPANPLUS/lib/CPANPLUS/Module.pm
index 5f7cec02c8..5f7cec02c8 100644
--- a/lib/CPANPLUS/Module.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module.pm
diff --git a/lib/CPANPLUS/Module/Author.pm b/ext/CPANPLUS/lib/CPANPLUS/Module/Author.pm
index 92940fa51f..92940fa51f 100644
--- a/lib/CPANPLUS/Module/Author.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module/Author.pm
diff --git a/lib/CPANPLUS/Module/Author/Fake.pm b/ext/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm
index 115c29ed7b..115c29ed7b 100644
--- a/lib/CPANPLUS/Module/Author/Fake.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module/Author/Fake.pm
diff --git a/lib/CPANPLUS/Module/Checksums.pm b/ext/CPANPLUS/lib/CPANPLUS/Module/Checksums.pm
index e1a2bbdb6a..e1a2bbdb6a 100644
--- a/lib/CPANPLUS/Module/Checksums.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module/Checksums.pm
diff --git a/lib/CPANPLUS/Module/Fake.pm b/ext/CPANPLUS/lib/CPANPLUS/Module/Fake.pm
index 84d0233cf8..84d0233cf8 100644
--- a/lib/CPANPLUS/Module/Fake.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module/Fake.pm
diff --git a/lib/CPANPLUS/Module/Signature.pm b/ext/CPANPLUS/lib/CPANPLUS/Module/Signature.pm
index cec6f2906b..cec6f2906b 100644
--- a/lib/CPANPLUS/Module/Signature.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Module/Signature.pm
diff --git a/lib/CPANPLUS/Selfupdate.pm b/ext/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
index 1346de8cbb..1346de8cbb 100644
--- a/lib/CPANPLUS/Selfupdate.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
diff --git a/lib/CPANPLUS/Shell.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell.pm
index 854d46b16a..854d46b16a 100644
--- a/lib/CPANPLUS/Shell.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell.pm
diff --git a/lib/CPANPLUS/Shell/Classic.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell/Classic.pm
index 08c03bcf38..08c03bcf38 100644
--- a/lib/CPANPLUS/Shell/Classic.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Classic.pm
diff --git a/lib/CPANPLUS/Shell/Default.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index faeb6ff5a9..faeb6ff5a9 100644
--- a/lib/CPANPLUS/Shell/Default.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
diff --git a/lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm
index ad4701a488..ad4701a488 100644
--- a/lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/CustomSource.pm
diff --git a/lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
index ca765f9e0a..ca765f9e0a 100644
--- a/lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
diff --git a/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm
index d2b829abde..d2b829abde 100644
--- a/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm
diff --git a/lib/CPANPLUS/Shell/Default/Plugins/Source.pm b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Source.pm
index 889b3d3d9b..889b3d3d9b 100644
--- a/lib/CPANPLUS/Shell/Default/Plugins/Source.pm
+++ b/ext/CPANPLUS/lib/CPANPLUS/Shell/Default/Plugins/Source.pm
diff --git a/lib/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t b/ext/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
index 18011fd289..18011fd289 100644
--- a/lib/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
+++ b/ext/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
diff --git a/lib/CPANPLUS/t/01_CPANPLUS-Configure.t b/ext/CPANPLUS/t/01_CPANPLUS-Configure.t
index fc02640c7a..fc02640c7a 100644
--- a/lib/CPANPLUS/t/01_CPANPLUS-Configure.t
+++ b/ext/CPANPLUS/t/01_CPANPLUS-Configure.t
diff --git a/lib/CPANPLUS/t/02_CPANPLUS-Internals.t b/ext/CPANPLUS/t/02_CPANPLUS-Internals.t
index 84b78f3ade..84b78f3ade 100644
--- a/lib/CPANPLUS/t/02_CPANPLUS-Internals.t
+++ b/ext/CPANPLUS/t/02_CPANPLUS-Internals.t
diff --git a/lib/CPANPLUS/t/03_CPANPLUS-Internals-Source.t b/ext/CPANPLUS/t/03_CPANPLUS-Internals-Source.t
index 65f1e54c35..65f1e54c35 100644
--- a/lib/CPANPLUS/t/03_CPANPLUS-Internals-Source.t
+++ b/ext/CPANPLUS/t/03_CPANPLUS-Internals-Source.t
diff --git a/lib/CPANPLUS/t/04_CPANPLUS-Module.t b/ext/CPANPLUS/t/04_CPANPLUS-Module.t
index f45755143b..f45755143b 100644
--- a/lib/CPANPLUS/t/04_CPANPLUS-Module.t
+++ b/ext/CPANPLUS/t/04_CPANPLUS-Module.t
diff --git a/lib/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t b/ext/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t
index 9d648fc38f..9d648fc38f 100644
--- a/lib/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t
+++ b/ext/CPANPLUS/t/05_CPANPLUS-Internals-Fetch.t
diff --git a/lib/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t b/ext/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t
index 65bde1181a..65bde1181a 100644
--- a/lib/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t
+++ b/ext/CPANPLUS/t/06_CPANPLUS-Internals-Constants.t
diff --git a/lib/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t b/ext/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t
index b03befa8ac..b03befa8ac 100644
--- a/lib/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t
+++ b/ext/CPANPLUS/t/07_CPANPLUS-Internals-Extract.t
diff --git a/lib/CPANPLUS/t/08_CPANPLUS-Backend.t b/ext/CPANPLUS/t/08_CPANPLUS-Backend.t
index 73611e872b..73611e872b 100644
--- a/lib/CPANPLUS/t/08_CPANPLUS-Backend.t
+++ b/ext/CPANPLUS/t/08_CPANPLUS-Backend.t
diff --git a/lib/CPANPLUS/t/09_CPANPLUS-Internals-Search.t b/ext/CPANPLUS/t/09_CPANPLUS-Internals-Search.t
index c00437d09a..c00437d09a 100644
--- a/lib/CPANPLUS/t/09_CPANPLUS-Internals-Search.t
+++ b/ext/CPANPLUS/t/09_CPANPLUS-Internals-Search.t
diff --git a/lib/CPANPLUS/t/10_CPANPLUS-Error.t b/ext/CPANPLUS/t/10_CPANPLUS-Error.t
index 800a126c0d..800a126c0d 100644
--- a/lib/CPANPLUS/t/10_CPANPLUS-Error.t
+++ b/ext/CPANPLUS/t/10_CPANPLUS-Error.t
diff --git a/lib/CPANPLUS/t/15_CPANPLUS-Shell.t b/ext/CPANPLUS/t/15_CPANPLUS-Shell.t
index 2a7e8c6b87..2a7e8c6b87 100644
--- a/lib/CPANPLUS/t/15_CPANPLUS-Shell.t
+++ b/ext/CPANPLUS/t/15_CPANPLUS-Shell.t
diff --git a/lib/CPANPLUS/t/19_CPANPLUS-Dist.t b/ext/CPANPLUS/t/19_CPANPLUS-Dist.t
index cb0cd33305..cb0cd33305 100644
--- a/lib/CPANPLUS/t/19_CPANPLUS-Dist.t
+++ b/ext/CPANPLUS/t/19_CPANPLUS-Dist.t
diff --git a/lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t b/ext/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
index a203c88ffe..a203c88ffe 100644
--- a/lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
+++ b/ext/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
diff --git a/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t b/ext/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t
index 55007ba566..55007ba566 100644
--- a/lib/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t
+++ b/ext/CPANPLUS/t/21_CPANPLUS-Dist-No-Build.t
diff --git a/lib/CPANPLUS/t/25_CPANPLUS.t b/ext/CPANPLUS/t/25_CPANPLUS.t
index 9cbd15c7e3..9cbd15c7e3 100644
--- a/lib/CPANPLUS/t/25_CPANPLUS.t
+++ b/ext/CPANPLUS/t/25_CPANPLUS.t
diff --git a/lib/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t b/ext/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t
index a816faa176..a816faa176 100644
--- a/lib/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t
+++ b/ext/CPANPLUS/t/30_CPANPLUS-Internals-Selfupdate.t
diff --git a/lib/CPANPLUS/t/40_CPANPLUS-Internals-Report.t b/ext/CPANPLUS/t/40_CPANPLUS-Internals-Report.t
index d7c2bd81cd..d7c2bd81cd 100644
--- a/lib/CPANPLUS/t/40_CPANPLUS-Internals-Report.t
+++ b/ext/CPANPLUS/t/40_CPANPLUS-Internals-Report.t
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz
new file mode 100644
index 0000000000..593556d3a0
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz
new file mode 100644
index 0000000000..20d8e2c73d
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS
index ea9aa57313..ea9aa57313 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta
index 870d7b73f8..870d7b73f8 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme
index ba8894c152..ba8894c152 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz
new file mode 100644
index 0000000000..0fa39972eb
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz
new file mode 100644
index 0000000000..1d1e081ad6
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS
index f124759db0..f124759db0 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/CHECKSUMS
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme
index ba8894c152..ba8894c152 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.readme
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz
new file mode 100644
index 0000000000..cef5d53455
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS
index 042008cc56..042008cc56 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/CHECKSUMS
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme
index ba8894c152..ba8894c152 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.readme
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz
new file mode 100644
index 0000000000..0d499cd40d
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS
index 5d2a6d6ee3..5d2a6d6ee3 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/CHECKSUMS
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme
index ba8894c152..ba8894c152 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.readme
diff --git a/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz
new file mode 100644
index 0000000000..a092523e36
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm b/ext/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm
index 5850371d78..5850371d78 100644
--- a/lib/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm
+++ b/ext/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm
diff --git a/ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz b/ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz
new file mode 100644
index 0000000000..ec0f69d8cb
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz
diff --git a/ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz b/ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz
new file mode 100644
index 0000000000..6574e158bd
--- /dev/null
+++ b/ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz
diff --git a/lib/CPANPLUS/t/inc/conf.pl b/ext/CPANPLUS/t/inc/conf.pl
index 1287ec9df9..1287ec9df9 100644
--- a/lib/CPANPLUS/t/inc/conf.pl
+++ b/ext/CPANPLUS/t/inc/conf.pl
diff --git a/lib/.gitignore b/lib/.gitignore
index 5c5cbcb07b..b284724406 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -11,8 +11,57 @@
 /Config.pod
 /Config_heavy.pl
 /Config_git.pl
+/CPANPLUS.pm
+/CPANPLUS/Backend.pm
+/CPANPLUS/Backend
+/CPANPLUS/Backend/RV.pm
+/CPANPLUS/Config.pm
+/CPANPLUS/Configure.pm
+/CPANPLUS/Configure/Setup.pm
+/CPANPLUS/Dist.pm
+/CPANPLUS/Dist/Autobundle.pm
+/CPANPLUS/Dist/Base.pm
 /CPANPLUS/Dist/Build.pm
 /CPANPLUS/Dist/Build/Constants.pm
+/CPANPLUS/Dist/MM.pm
+/CPANPLUS/Dist/Sample.pm
+/CPANPLUS/Error.pm
+/CPANPLUS/FAQ.pod
+/CPANPLUS/Hacking.pod
+/CPANPLUS/Internals.pm
+/CPANPLUS/Internals/Constants.pm
+/CPANPLUS/Internals/Constants
+/CPANPLUS/Internals/Constants/Report.pm
+/CPANPLUS/Internals/Extract.pm
+/CPANPLUS/Internals/Fetch.pm
+/CPANPLUS/Internals/Report.pm
+/CPANPLUS/Internals/Search.pm
+/CPANPLUS/Internals/Source.pm
+/CPANPLUS/Internals/Source
+/CPANPLUS/Internals/Source/Memory.pm
+/CPANPLUS/Internals/Source/SQLite.pm
+/CPANPLUS/Internals/Source/SQLite
+/CPANPLUS/Internals/Source/SQLite/Tie.pm
+/CPANPLUS/Internals/Utils.pm
+/CPANPLUS/Internals/Utils
+/CPANPLUS/Internals/Utils/Autoflush.pm
+/CPANPLUS/Module.pm
+/CPANPLUS/Module/Author.pm
+/CPANPLUS/Module/Author
+/CPANPLUS/Module/Author/Fake.pm
+/CPANPLUS/Module/Checksums.pm
+/CPANPLUS/Module/Fake.pm
+/CPANPLUS/Module/Signature.pm
+/CPANPLUS/Selfupdate.pm
+/CPANPLUS/Shell.pm
+/CPANPLUS/Shell/Classic.pm
+/CPANPLUS/Shell/Default.pm
+/CPANPLUS/Shell/Default
+/CPANPLUS/Shell/Default/Plugins
+/CPANPLUS/Shell/Default/Plugins/CustomSource.pm
+/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
+/CPANPLUS/Shell/Default/Plugins/Remote.pm
+/CPANPLUS/Shell/Default/Plugins/Source.pm
 /DB_File.pm
 /Data
 /Devel/DProf.pm
diff --git a/lib/CPANPLUS/.gitignore b/lib/CPANPLUS/.gitignore
deleted file mode 100644
index 10d00b5797..0000000000
--- a/lib/CPANPLUS/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.gz
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
deleted file mode 100644
index 55d06dfa63..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
+++ /dev/null
@@ -1,19 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("%_EO$4``S`Q;6%I;')C+G1X=`!+S,E,+%9P#8T(5@`#)=>*DM"2S)QB
-M*RO?Q.Q4$"Y2`$HZYZ>D*M@D%R3F%>24%CND5B3F%N2DZB7GY]HI<25"#?'S
-MAQB#U1"_?"+-\76".\8W/Z4T)]7*RJDT,R>%:.UP9Z!J]_,G:`(`W)]=R`X!
-"````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
deleted file mode 100644
index 3e32332f32..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
+++ /dev/null
@@ -1,34 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("!1%OT4"`T)U;F1L92U&;V\M0F%R+3`N,#$N=&%R`.V7:V_:,!2&^8I_
-MQ6F91"L52"`)6KI6`Q8TI`$5EZW2-"%##%C-K8FSEDW[[W,2:&E$6VGKH$Q^
-M(`KR<4YB7K_'3CUT3(L4FJY;J&._(!4EN91Y821.5563LY:<.:MS_%N65+6J
-M*67^R4BR(E<J&5`S6R`,&/8!,E?8(4_UNYD38CTSR+5!9?:$^@;]+3HN[5C_
-MJB0+_7>I?])>VI'^FBR7A?ZO0'_>7MJ%_EI%%?J_$OUY>]&S_U)_35$>U5^5
-MM'O]I2K7OQK7?TGH_\_Q\.0*SP@D>NLZ%US7N>*G"+WY;/3ZK6X'SN`PFA>'
-MO$WFQVAD=#Z,1@B=S0DV9>C4V@9"Z01P%V]T.P.C,^@CM(KINC'4]<L^<*+,
-MZ4BG&\72D7;]L6NBR/HUC1L3TB21Y2/5AH./W1Y"QBT;,FH%/`6^(M'A0\<%
-MGJGAF@3>33SL>%88O">WV/8L4IRX]CG/,@D9']_]/Y'96S;Y/_H?II2/]N+3
-MBZW_3_I?45?^E\OE<KS^2XKP_W:&3V"#"TY1%`B83R>,6_Z+3QE930LX0I&A
-M(MNO&^SL'/+I(I`_B;LN"\FHV>NV5UTW+C+Y$\C!E#IF`*OJ$R<P:<!2]_K)
-MZTK[HF?T^W&ZV0_J0>'ME&?H#YO-UN6R-0^_DF=(+/_P<?_(_GQ,V5J]/^C5
-M&H.U9-=?TX/_=H*.3Z,HVC?_USJMIM$?O.3[WU/^+\O5U/Y/+6O"_UMAHPW1
-MV@J`5K,AF\T.YC0`*_*B.X4H'J"V,:@5%[8%S]%VS9#7#ILP7#`QPW"$39.8
-M,%[`G?F.]W@A_9_6_Z6FV_*_4DV__ZF*I`K_;X,<S!GS]%+)COU9&(?4,HN!
-M&_H3,G7]&2DZA,4SHA!X9%*<,]M"N<L$B`L"_V+P?)>Y;.&1@X,#@!:#&VI9
-M,)ECA[]<4`?8G,`T9*$?=XBOSB$'VT2_JQ`/IR+Z3OR`NHZ^MGU?-HVFOFOK
-ML+ET48<+:EDF]0-^:<#W+<@GUR'U2:`C%&TD?#H.690F>EP=DH&C&7&(CQDQ
-H1^.%OFE+!,N[@U:L2*)0"00"@4`@$`@$`H%`(-@;?@-?EF['`"@`````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed
deleted file mode 100644
index d27ed94c68..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed
+++ /dev/null
@@ -1,40 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL(`#P*BD<``^V:;6_B1A"`\WE_Q214(I$.QQ@;)*<YE;M"$^E(JB37GG0]
-M10M>P,+>=>WUY:*J_[V[?D$Q).1.`J=2YI&B!>^8V?6\>,;.4(C6.QJW3,-L
-M'^_M!E/1<YQ\[.:CHARSSVVS9UNVV>EUU/&VU6MW]L#9T7HJI(FD,<#>@G*V
-M2>YNSEBP87YE4UM>Y<X8/K3_V.>[\('OL[]E=:R.W>EVE?T[=M=&^]?!FOVG
-M0HQI;$2;]OJ#Z.OA;+*_[13V5P[0T_9W5`+8@UHNXBNW?V/_.$WBS/(1BP-"
-MHMCG$@YR-S@X(:1]0EYZD<C.J,3_^[/^Q6^#ZVWKR$+<MI^.?\M>B?].S\3X
-MKX5SH"%0*"P/4S]@&.ZOB$K\!_[X?U/_65C_U<&:_=6!;?O`C]O?MDP'[5\'
-MC]K_G6X`PJWI>.;^KTV_5O_;)M[_ZX"<SAGUVG#1'PT(N:9A%#!H@?("4"T`
-M)/D!]9&4DOV/-V>75TO9$>7P<R[V"_N6C<9$A&^7\I<W9P,E_I7%B2\X!#YG
-M"?@<(N%!,A=IX,&8@3_C(F:>2W[Z8W!U?7YY`:?0Y$*"6+@P4V-Y_C06H3YW
-MOZEZD]-)*E7+0B<+.F-ZT:ZK?%=--&!-GUI4R+A,'E/:@.]26_Q$IKH!<NZK
-M'T[4R"K:X(XU8P:!$`N?S]2UBRN[.FSJ6&L>?3:_G``T'BR'?:5!TR/D'Z*/
-MW[%R2O#@'B1=L$S5U(\3654X%2E7NP"E<T(#-<*3^TG81'!O=5L>TWOZ%YN]
-M5T<E_X^4C^D.P/C]PS9UZ'RXZ?F/Y716\K_=[?8P_]=!FC`8?),?I1\DKJL=
-M0/_I%/IG[$M6>L1AEE3T30(></H6FF72;;[)1(JT<SN\NAR5(M6RHA`<?!K<
-M#L\_J)YS^5N?FY4'D,TO;_0$.3K)!#`Q[8)J_/<OSH>#ZYLMZ]#QT-WP_,?J
-MK-7_)M9_]5`\^"%7@_ZOJ@)\<`<@I3<0R1*IXI%4XYA4@I6,!C=]XSX,X#E&
-MPDM5W1@R25L>E10.J><Q50#=PS+]'&&PUT0U_@L;;EG'<_'?-9V5][]V6XEA
-M_-=``^921N[Q<9B%96N<^H%G)"*-)TQU+C-F<"8SQV@E$9L8<QD&I/$I!VZ*
-M%HA"%`LIY'W$]O?W`<XEW/E!`),YY:HQ4]U7UKFD,HTS@>SL!N$T9.XR,12N
-M6':*Q81VS/+0K6Y77%C)0SY7)@P"3_5%ZIQ$52TD9G^G?LP2W=FI7:@.AT_]
-MF5)^6\Y`DD:1B"59G\H59T7*^SO/7<]@Q:*(YR<R]L>IU$O3>W<AOXIDQCB+
-MJ63>[?C>?:R^6C9@7<-R7C+95>(_OPEL7<<SSW]T`;#Z_L?!^*^'XOU/;GE\
-M_?/JJ,1_4>AM6\>S\=]MK_;_ZA/&?QT\]?\?;<-H_\4/3LKO8@'Y]Y=>,((@
-F"((@"((@"((@"((@"((@"((@"((@"((@"((@>_\!0F6@FP!0````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed
deleted file mode 100644
index 21cf458ae0..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed
+++ /dev/null
@@ -1,18 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/EUNOXS/perl5.005_03.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL(`'3DO44``^W/,0J`,`Q`T1RE)Y"T-O4XXN"DB%2]OR(*NNC4[;_E#\F0
-MS'T>K5*U5FLI1`\IQK--LE<OXM6LJ5/P,8CZ8$'%::F#GK9E[;)S,G13_[7W
-=-[\?N0L`````````````````0$$[-9`]0P`H````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed
deleted file mode 100644
index 512aafc14b..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed
+++ /dev/null
@@ -1,51 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/EUXS/Foo-Bar-0.01.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("`DY34("`T9O;RU"87(M,"XP,2YT87(`[5IK3]M(%,U7YE=<H%5``A.;
-M/*0@5@0P-"IY*`E=JFX53>))8F%[4L\8B%#_^][Q(P^VI5\VZ78[1P0G]IWG
-MO>?,^-I7G!^>T_"P8!3,H]QZ4$!42B5U-"LE<_F8(6<6+.O8.BX633QO6B6K
-MDH-2;@.(A*0A0.Z>!NPUNQ]=SP:2'7\17"W[_^)=K7EM=]?A_V*Q^'W_6\74
-M_Q@`E3+Z_[ADE7)0T/Y?.^I`?:"0>AY&KL=(3N.WP0K_&[5F_<KN]C:L_Q:*
-M_:K^'Y?+1<W_32`E/NG8M<N&3;(((`UZSY08&.T;@O%A3/WX\"2(9$(:4X\,
-MW.!HQ/E`7?1(P^[5C)GOP8_0X$[D,?"9I(<.E13VJ.,P!P8S4&VJ3[BO)>CG
-M\#]UXAKX7WYE_2\6K27^%Q3_*Y6*YO\FL`L3*:?5HR,_YN7A('(]QQ`\"H=L
-MQ,,Q,P(FX\`X%%,V-";2]\CN70+H35P!^$=A&G+)Y6S*MK>W`>H2'EW/@^&$
-M!F,&;@!RPF`4R2B,#>+2NR2@/JO.E2$-1?+`0N'R(+V@`C,[U1^%W*]"JD=N
-M@*[S/,<-!=H*5S(2LB^1&S)1)<1QA0S=0215.=6Q*B1#)&,6L)!*YO0'LRK8
-M3_)6NIZH5N?R`VES4#:L$OF-^)]*^SKV_Z77[O\JA1?[_V*A9&G^;P+G]G6]
-M"<_(7S>0L&,:AOE7L`-?3T@DF*)DM8KA<4+2Z_P>U/43O4#_'_FOMG3_B?S/
-ML571^9^?X__YEGZ#^E\LO=#_DFGJ_,]F]G_;1Y$(8\]/6>B13.B3,$"A)Z86
-M^]]%_Y,[_+7H_VO\MY#S+_*_9:NL^;\1_KO!T(L<!COV7<_N-(W)#EF<4Y*P
-M>N:N>WNNSI!&Z_+VQH;3^1YQ:ZM=NWA?NUX]1_`V31)7]-D#"_;<8!K)?;*E
-M)$8A_DW4MXO6I5TE6QV[]Z%V@S4DIO`6+#@]A<+^26S5NNVU;WMS.RU,_S[_
-MI_ZF^6]9Q<H_^&\6-/\W@2D=WM/Q\IV>NN]3J9.AQ,4_3:B`_33EH61X.3MS
-M.0OH#:<.2XL\T%#`E\<].*MW:_#6OFNW.KU^KW;=A;/T1^M]]A7>?+`[W7JK
-M"4AL$I<X586S9I9J5P:[4)?,%R`YL-@"A0._#ZGG,6Q5I9$$#H2I)++#1C3R
-MI`%-+ED5'`X!EVDQK"BV7;*#1U=.."H-55F?&8PY=R!D5/#`@%L<UZ+O*M_$
-MJ&-@+9=)K<+UI]XLZQ/V!F8\"F$:#3QW"*,H&*KLDSCR&;;AB*,A5RFK0`I#
-MC2E.GF$A_BBP-T./AE29;ZG9O.OVF)"0K^+U_(F:@)&J.QM.P)@#$LL?@,\?
-MW&"L?@1CK`==,Y38IWB"LMGFX9(/L+(X-R?H@TK#^SR<&63%7ZB^D%<-P^D?
-M\$GYA6R1??B<.&LQ(<KN[!G>+)5]CLM]A:_+MHEO51TG9.[X4\@KS<'!D0'G
-M$B..3N=1.(^/V/GMD'DJ%AQ()Q*]!!,6,B/>G?;[=O.RWT?#<[1[5/E((:,!
-MSM4P\ED@XUF%$4Y"[)TD"VC`1YS.`9,JVICC8DC);4).)^AA$YJUADU(ZH1#
-M:.,RB%Z6+!!950./3A;_Y@6['YNM=K?>);A<+?RH%J_O%+BTNQ>=>KN'8R6D
-M^^UN)Y4<P!#C4B:/2B;6DS!4FM7C_%Z`Y]XSE6(E-,()"H&/XH3KHLN/%&G"
-MQIX[QIJ!!3P:3Q2=/*:B0-FJ*2-1H*:"88R3\Y7^&FF'K90/A#1YL,(W,A]2
-M[;;WKM4AI(8$,C#*>7@`U(@,U;,S:HRI1Y]FQ@C7&O6ACW2VF#[;AMI-MX6W
-M(3CE>^:^:G>(6P2]4&]B_5]ZZ+?1_7_Y^&7^MV3JY[^YS0R??>L1".KNGR$J
-M0181>_'V.Z]T,;]XEHO+0SZ3[/Q!8I(*=_^JTVKD$Y-D6YD_@%T8N0'*=Z;N
-M<0G[SNY?U6_L[J+23_F53%3^\T'6HEI"-&G7Q?_D)8"U[/]??__K)?^/51I8
-M\W\#2-__2CRO7__2T-#0T-#0T-#0T-#0T-#0T-#0T-#0T-#0T-#0T-#0T-#0
-.T-#X9?`W%LHWQP!0````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed
deleted file mode 100644
index a72e86e6f0..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed
+++ /dev/null
@@ -1,35 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/MBNOXS/Foo-Bar-0.01.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("-<X34(``T9O;RU"87(M,"XP,2YT87(`[9E;;]HP%,=Y]J<X+9722@-R
-M!0G6:G2#M=)*I]+MI:M0((9&)#;*I5TU[;O/)J1JH!WK%-)U/;\7XTOXVSD^
-M]G'<Y;QR:`<5M:IJM=)F4`4-RY*IUK"T^VE*25-UW=`-T]`;)573+<,J@;6A
-M_F2(P\@.`$I3F]'?M5M7GPXD35\(W?OV?W_4[GWL]//6D.^C;IJ/VU\WE^QO
-M6*(("GF)K]S^QV#[8,/"\C!V/4J>NT](<63\_Z3=.^YV^N<Y:ZSS?TVM+_M_
-MO6Z@_Q?!PO')6:?]X:1##F/7<ZJ?/Y%T*I"(AE%UYA'/'=;$9*F)R5*=^63H
-MLMJ8\Z',>;ABO%@R_K^P==X::_?_NK;D_Z9JUM'_BZ"\58O#H";=>48#CY!9
-MX+((MK5J5?O&MEMIGD\AR3]WAY%<R?B_7.,WH/'T\Y]AJ`:>_XI@Q?YRC\]9
-MX^GV-U6]CO8O@@?MG\1XN6FLV?^EZ9?L;ZD8_Q<#V;^BMJ-!KRVB?]*W_9E'
-MH0)B%H`([R%,"L1/DK9L?SD_.CV[:WMB,WB;-'M'O\_3ZHC[!W?M3\^/.J+Y
-M-0U"ES/P7$9#<!G,N`/A%8\]!X84W`GC`76:9.=KYZQ_?-J#?5`8CX!/FS`1
-M:?K\.."^?'9+:0F)41R)D,4>3>T)E9UN-L7<%15E6-$3G?(IB\*'1,OP1[*+
-MOYA+ER&Z<L4?AR*E&36XH4I`P>-\ZK*)>'=!9E2[BO0U9>]"O6P!E.]UAU[;
-MGN(0\H/(\AN:5G'FW4)D3^E<:NP&8905'/.8B5&`T!S9GDCAT?&$=,29LSPL
-MA\HQ_21$PP#O=9%9_^4I8`,:?Q7_X??_0EBQ_]U'G?PTUI[_36MY_]<T#??_
-M(GCL_)],`W'>QRWAOR;C_^G7WYPUUOF_;C16SG\&QO^%$(<BA.=.[%$1.DOS
-MMX`0_Q9VAC(CHD=&;[(-1'BY*T-,?UXX8+9/8?\`E#3Z5M[(VG`4N+-H(.\3
-M0UE]`4IF=U'@4K;;:Y%$J7(P"J@=T<$\-T@>QY5GXV3\/[D$REUC[?ZO&\OQ
-MGZFIZ/]%L+C_3RR/U_\(@B`(@B`(@B`(@B`(@B`(@B`(@B`(@B`(@B`(@B`(
-,\D_S"QCQWFL`4```
diff --git a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed
deleted file mode 100644
index c2f66fa230..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed
+++ /dev/null
@@ -1,50 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/MBXS/Foo-Bar-0.01.tar.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("-\X34(``T9O;RU"87(M,"XP,2YT87(`[5K_3QI)%/=7YZ]XU39H(BN[
-M@%PP-*)N+:D"$6QL[AHRP``;EQVZ.RN2IO][WV,79+4]KG>(UW8^B<+NO)GW
-MYGV;F3>\D3)]S/UTQLB8^QM/@PRBD,_3IUG(FXN?,VR8&<O*6ME<-EO8R)A6
-M/GNP`?DGDB>!,%#<!]BXX9[X.[IE[;.)S#Y_$KQ9M/_)VW+US&ZLF@?IXR"7
-M^[[]K=P#^V?S5GX#UJ+$W]S^%>!#X!!;'GJ.*]ASRZ2Q/B3B_Z)<K;RQ&\T5
-M\U@6_R8F^P?Q?W!0T/&_#K0=;[\G99O[QLAEQZ'C=HWZ.8OS`7.=]CZZR/XQ
-MM0\3CW<!F_D+N[3+IQ<V4R)0-,R%W2P;DZ&K,\G_'HGX)_,^`8\?W_]ELYF<
-MWO^M`X_L3^&]8AX_;O]<QBIH^Z\#W[1_E-Y7QF/9^F\5'J[_>=/,Z?5_'=AV
-MO(X;=@5LV==-^[)J#+;8_;N1\-WDF^O&U3&]81>UTZMS&TJ`#E,LHL=L;M;+
-M)^_*9\EWC#F>8D[0$K?"VW&\4:AVV2:^`\+TF=&WD]JI762;EW;S??D<1XA(
-MX1584"I!9O=P2E6[:M:OFG,ZO;_XS_AN_(^&*^.Q)/XM*U=X&/\93`DZ_M>`
-M$>_<\+Z81^PA"P,!@?*=CCIDS!>?0L<78-^-I*\$-L_>G$X\?BYY5\1=;KD?
-MP*?Q#AQ5&F5X95_7:Y?-5K-\UH"C^*'V;O857KZW+QN56A4PL-FT1XDZS]@L
-MC$X$VU!18AB`DB"F%)@X\'N'NZY`KAX?B@`G(J`]@:[H\=!5!E2E$D7H2O"D
-MBKOA0%/:!3H8.VH@,=-PN!7^!/I2=L$7/)">`5<XKWO9'2]0@G<-'.4T&C5P
-MAB-W,I,)I8&)#'T8A6W7Z4`O]#K*D5ZP/Q3(HQOL=_!!<4\%!LVI.7`"ZB3'
-M`4K3<;G/B7R3M'G=:.)9"E)%;$\=D@)Z-/9L.IX075#8?P^&\M;Q^O3@]7$<
-M-$U'H4Q3!<VT+?T%&^!@8P=%#?BM@*$82G]BL(2],/M"BAA#Z37\279AFVP7
-M/D;&NE<(T1U]AI<+?3]/^WV!+XNTD6UIC$,V-WP)4I1S<'*L+:5"C^.CN1?.
-M_6-J_+HO7/*%+L2*1"O!0/@"U6@>LE;+KIZV6DAXC'1C0*T&*FRCKCKA4'AJ
-MJE7HH1*FUAG*;N@*`SZ@.MM"D;>)KH,NI5XP5AJ@A4VHEO$TRV(CI*&.RR!:
-M60DOF`W5=OG@_M^\8^-#M59O5!H,EZM[.]+B]9T.IW;CY+)2;^)<&6M\6^QH
-MD#WHH%\JU`)Z[\"Z"PR,"G"EO`G`=6X$NH!@/$0%^2![]+0@\IACF(B^Z_1Q
-M9!">#/L#"B=7D!<0+:F,A1ZI0J"/L^.$O$8LL!7'`V-5Z27BC<VG5+YJOJU=
-M,E;&`#+0RZ6_!]P(#9+LB!M][O*[B='#-8;^^)A/[M5GVU`^;]08HYW'CKE+
-M?#NX17CN-/G+(EG_B^LV*^:Q;/^?S68?G?\R>OU?"]+I-&Q_*%^<%TTCPVAU
-M+$+L$PP71$H>12#GB%-+$5-9&GX@M'F;4GM'%?]!%L55$QM1@M"[\>388YBM
-MA$\YK]6>%.%BFKEQ@:`J)<32H7#60>8/<V^^DM-LJ%CYW*K]*9"(_[A^NVH>
-MR^(_4WA<_\GI^O]:<&R?5:KP&48^G<FW3,,P__*VX$NTJ;\_%<3M\@:H_5`'
-MUR^"1/S39=`3\/A7]7_]^X^UX)']YY>!J^.Q-/_G\H_KOY;._^O`]HO],/"G
-MEJ<C%YLE^L@-,-'3"?NYA=1X,B3B/[K&7SF/I?%O/3S_97.FJ>-_'8A__Q59
-M7O_\Z[=#(OYG/_]9,8]E\6_EOG'_K^L_:P&=\A)U%5SQAQ-XV9[66$K@B?&#
-MN@L#V*'+V*B.WJ*2$=T3I&9GQ=0>M08=WQFI%B64(+I&2"5VERGX2'1T2Q#Q
-M2K^.RMNMZ5,KZJ^W'AH:&AH:&AH:&AH:&AH:&AH:&AH:&AH:&AH:&AH:&AH:
-+R_`55?+KB0!0````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
deleted file mode 100644
index a98f32d22d..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
+++ /dev/null
@@ -1,25 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("#=P,DH``S`R<&%C:V%G97,N9&5T86EL<RYT>'0`G=-1;],P$`#@=_^*
-M>^`!I,;Q4E5,?J(I+0+:;:)$V]ODQ;?6(K$C^[)0?CWVRK1146`[68IDGS_?
-M6?'"-"CA(431J?J;VF#@&DF9)G#Z3JSZLGS,@2U1)_-\&`;>H6]X[=I\=C$]
-MRUNG^P9#?D1YCZ'VIB/C;-0N]BE@58L!;EUO-1@+VGBLR?D=O+HW54];YT-N
-M=,YFKNE;&WZ5TCT!1G"'/D1X%*=IRSY:0JM19POG)4Q[<JTBU'"+5&_!NYZ,
-MQ3#:'QXA!.WJOD5+*I7'V:4W%(FLW*73VD:;0(-*FU_?0<''HG@#-SN86NU1
-M!?[9H36;=\J:5L6>V3+RV2SV1&G[R2E;JD!9U>E4A81+U",8"_BD+!1"%"`F
-MLHCC+7Q8?65LX9R4I?)2SBLIK]9P$(*+D_2=5U?K/"9G,3=+DYR4YYL?3X!5
-M^3=@5?X7<'9^2#P":>T?1&KB.#&OGD%(N>YO7D(<WL`SB#+^F?&-R&/4`;%/
-@S_XDS09]K([[*'Z7TN.:<"$FUV+\0+"?<7X";+`#````
diff --git a/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed b/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
deleted file mode 100644
index 4a36c7a861..0000000000
--- a/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
+++ /dev/null
@@ -1,28 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz
-
-To recreate it use the following command:
-
-     uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
-
-Created at Sat Jun 27 16:51:08 2009
-#########################################################################
-__UU__
-M'XL("#'FO$4``S`S;6]D;&ES="YD871A`%U3_6O;,!#].?HKCBXC"20A=<@&
-M"@OIYV!;/Z`-&V1E*/:U%I4M(\D-)N1_WTFVFVS&H.=W>N^>SO:U5,BAN2;3
-M3"=*6C=.A!/L$FUL9.&DSCD\IF@1A$%P*8*O$Q`N,$6Y(56*"<@\E,FF5,@Z
-MWFL(F])YMH),5+#Q5=(8C#'WO*@E2CBT#@IM'2:L4SN$+'#WA@:<S!"VV%.*
-M;%X1;!FBB&!MZT2L$Y,;=2@M97$:"B-##U*F6E%08>AQJT$_>_;?-A>E,11)
-M5522%NC.=2V.A<4QN]%)K,O<A7%%T]F,_332.<Q'YQ5QF4K(9BM<G$+_#:+Q
-M=!(-8%/!69X8%';\76,N7Y8BEYD8)\@NZ<3OH[\V<@C1#+[1`:+))(+))QY]
-MYI,I?+UY9,QO*43\*EX0+N[/;CF_>4\^#]4/L+)4Y<V9R5QP?EEF!9K1(L=M
-M?_V_;K3P,WL:C!9^&V@#5F92"1/\;+FIW_*.U0FS"KH&;:D<?('=?GY$4\M,
-MF(KX$QJH3$[:XC.9]I==[S/8T;0K^)@*F\Y99^G7W;(;:V7W)%QV_Q#;-!@M
-M=MU0;YWW?LOO1EM;[YNUD<SK&>T9"Y:T?4U$+\3I#3VT3K@C:`]0':`\P**&
-MR>$GJ`GZMDSK&:>B<.&1/5&"<-"F]3KDZ5UKS?FY,)Q?K3B_O?OU$)1>VX*D
-K!44+[EK0KO[5W?]8/<"C_T?NZP^A+5ZMCFU/3WL$GH8^T%]3O>X%W0,`````
diff --git a/utils/cpan2dist.PL b/utils/cpan2dist.PL
index 93a670989e..0e3ce94001 100644
--- a/utils/cpan2dist.PL
+++ b/utils/cpan2dist.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[ lib CPANPLUS bin ]
+                File::Spec->updir, qw[ ext CPANPLUS bin ]
             ), "cpan2dist");
 
 if (open(IN, $script)) {
diff --git a/utils/cpanp-run-perl.PL b/utils/cpanp-run-perl.PL
index fe588f5173..e71577f9f0 100644
--- a/utils/cpanp-run-perl.PL
+++ b/utils/cpanp-run-perl.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[ lib CPANPLUS bin ]
+                File::Spec->updir, qw[ ext CPANPLUS bin ]
             ), "cpanp-run-perl");
 
 if (open(IN, $script)) {
diff --git a/utils/cpanp.PL b/utils/cpanp.PL
index 932337b711..a295e95029 100644
--- a/utils/cpanp.PL
+++ b/utils/cpanp.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[ lib CPANPLUS bin ]
+                File::Spec->updir, qw[ ext CPANPLUS bin ]
             ), "cpanp");
 
 if (open(IN, $script)) {