47 files changed, 47 insertions, 47 deletions
diff --git a/MANIFEST b/MANIFEST
index 9634862cfc..f00f8f1ea8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -135,6 +135,50 @@ cpan/Class-ISA/ChangeLog		Changes for Class::ISA
 cpan/Class-ISA/lib/Class/ISA.pm		Class::ISA
 cpan/Class-ISA/t/00_about_verbose.t	Tests for Class::ISA
 cpan/Class-ISA/t/01_old_junk.t		Tests for Class::ISA
+cpan/CPAN/lib/CPAN/API/HOWTO.pod		recipe book for programming with CPAN.pm
+cpan/CPAN/lib/CPAN/Author.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Bundle.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/CacheMgr.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Complete.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Debug.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/DeferredCode.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distribution.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distroprefs.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distrostatus.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/FirstTime.pm		Utility for creating CPAN config files
+cpan/CPAN/lib/CPAN/FTP/netrc.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/FTP.pm			helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/HandleConfig.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Index.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/InfoObj.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd		helper file for validating config files
+cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml	helper file for validating config files
+cpan/CPAN/lib/CPAN/Kwalify.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/LWP/UserAgent.pm	helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Module.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Nox.pm			Runs CPAN while avoiding compiled extensions
+cpan/CPAN/lib/CPAN/PAUSE2003.pub		CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2005.pub		CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2007.pub		CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2009.pub		CPAN public key
+cpan/CPAN/lib/CPAN.pm			Interface to Comprehensive Perl Archive Network
+cpan/CPAN/lib/CPAN/Prompt.pm
+cpan/CPAN/lib/CPAN/Queue.pm		queueing system for CPAN.pm
+cpan/CPAN/lib/CPAN/Shell.pm
+cpan/CPAN/lib/CPAN/SIGNATURE		CPAN public key
+cpan/CPAN/lib/CPAN/Tarzip.pm		helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/URL.pm
+cpan/CPAN/lib/CPAN/Version.pm		Simple math with different flavors of version strings
+cpan/CPAN/Makefile.PL
+cpan/CPAN/scripts/cpan		easily interact with CPAN from the command line
+cpan/CPAN/t/01loadme.t		See if CPAN the module works
+cpan/CPAN/t/02nox.t		See if CPAN::Nox works
+cpan/CPAN/t/03pkgs.t		See if CPAN::Version works
+cpan/CPAN/t/10version.t		See if CPAN the module works
+cpan/CPAN/t/11mirroredby.t		See if CPAN::Mirrored::By works
 cpan/DB_File/Changes		Berkeley DB extension change log
 cpan/DB_File/config.in		Part of Berkeley DB configuration
 cpan/DB_File/DB_File_BS		Berkeley DB extension mkbootstrap fodder
@@ -671,44 +715,6 @@ ext/Compress-Raw-Zlib/zlib-src/zutil.h	Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/Zlib.xs		Compress::Raw::Zlib
 ext/constant/lib/constant.pm	For "use constant"
 ext/constant/t/constant.t	See if compile-time constants work
-ext/CPAN/lib/CPAN/API/HOWTO.pod		recipe book for programming with CPAN.pm
-ext/CPAN/lib/CPAN/Author.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Bundle.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/CacheMgr.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Complete.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Debug.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/DeferredCode.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distribution.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distroprefs.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distrostatus.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/FirstTime.pm		Utility for creating CPAN config files
-ext/CPAN/lib/CPAN/FTP/netrc.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/FTP.pm			helper package for CPAN.pm
-ext/CPAN/lib/CPAN/HandleConfig.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Index.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/InfoObj.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd		helper file for validating config files
-ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml	helper file for validating config files
-ext/CPAN/lib/CPAN/Kwalify.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/LWP/UserAgent.pm	helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Module.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Nox.pm			Runs CPAN while avoiding compiled extensions
-ext/CPAN/lib/CPAN/PAUSE2003.pub		CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2005.pub		CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2007.pub		CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2009.pub		CPAN public key
-ext/CPAN/lib/CPAN.pm			Interface to Comprehensive Perl Archive Network
-ext/CPAN/lib/CPAN/Prompt.pm
-ext/CPAN/lib/CPAN/Queue.pm		queueing system for CPAN.pm
-ext/CPAN/lib/CPAN/Shell.pm
-ext/CPAN/lib/CPAN/SIGNATURE		CPAN public key
-ext/CPAN/lib/CPAN/Tarzip.pm		helper package for CPAN.pm
-ext/CPAN/lib/CPAN/URL.pm
-ext/CPAN/lib/CPAN/Version.pm		Simple math with different flavors of version strings
-ext/CPAN/Makefile.PL
 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
@@ -803,12 +809,6 @@ 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/CPAN/scripts/cpan		easily interact with CPAN from the command line
-ext/CPAN/t/01loadme.t		See if CPAN the module works
-ext/CPAN/t/02nox.t		See if CPAN::Nox works
-ext/CPAN/t/03pkgs.t		See if CPAN::Version works
-ext/CPAN/t/10version.t		See if CPAN the module works
-ext/CPAN/t/11mirroredby.t		See if CPAN::Mirrored::By works
 ext/Cwd/Changes				Cwd extension Changelog
 ext/Cwd/Cwd.pm				Various cwd routines (getcwd, fastcwd, chdir)
 ext/Cwd/Cwd.xs				Cwd extension external subroutines
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 124ee25f70..16a4c8eb7f 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -370,7 +370,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'andk',
 	'DISTRIBUTION'	=> 'ANDK/CPAN-1.9402.tar.gz',
-	'FILES'		=> q[ext/CPAN],
+	'FILES'		=> q[cpan/CPAN],
 	'EXCLUDED'	=> [ qr{^distroprefs/},
 			     qr{^inc/Test/},
 			     qr{^t/CPAN/authors/},
@@ -407,7 +407,7 @@ use File::Glob qw(:case);
 			       },
 			   ],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> 'CPAN',
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'CPANPLUS' =>
diff --git a/ext/CPAN/Makefile.PL b/cpan/CPAN/Makefile.PL
index 589b59769c..589b59769c 100644
--- a/ext/CPAN/Makefile.PL
+++ b/cpan/CPAN/Makefile.PL
diff --git a/ext/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
index 1196cb0fcf..1196cb0fcf 100644
--- a/ext/CPAN/lib/CPAN.pm
+++ b/cpan/CPAN/lib/CPAN.pm
diff --git a/ext/CPAN/lib/CPAN/API/HOWTO.pod b/cpan/CPAN/lib/CPAN/API/HOWTO.pod
index e65a4bc931..e65a4bc931 100644
--- a/ext/CPAN/lib/CPAN/API/HOWTO.pod
+++ b/cpan/CPAN/lib/CPAN/API/HOWTO.pod
diff --git a/ext/CPAN/lib/CPAN/Author.pm b/cpan/CPAN/lib/CPAN/Author.pm
index 14ef2ef633..14ef2ef633 100644
--- a/ext/CPAN/lib/CPAN/Author.pm
+++ b/cpan/CPAN/lib/CPAN/Author.pm
diff --git a/ext/CPAN/lib/CPAN/Bundle.pm b/cpan/CPAN/lib/CPAN/Bundle.pm
index e7360f8048..e7360f8048 100644
--- a/ext/CPAN/lib/CPAN/Bundle.pm
+++ b/cpan/CPAN/lib/CPAN/Bundle.pm
diff --git a/ext/CPAN/lib/CPAN/CacheMgr.pm b/cpan/CPAN/lib/CPAN/CacheMgr.pm
index 827baeaefd..827baeaefd 100644
--- a/ext/CPAN/lib/CPAN/CacheMgr.pm
+++ b/cpan/CPAN/lib/CPAN/CacheMgr.pm
diff --git a/ext/CPAN/lib/CPAN/Complete.pm b/cpan/CPAN/lib/CPAN/Complete.pm
index e1fe896d4a..e1fe896d4a 100644
--- a/ext/CPAN/lib/CPAN/Complete.pm
+++ b/cpan/CPAN/lib/CPAN/Complete.pm
diff --git a/ext/CPAN/lib/CPAN/Debug.pm b/cpan/CPAN/lib/CPAN/Debug.pm
index 926b0d79b4..926b0d79b4 100644
--- a/ext/CPAN/lib/CPAN/Debug.pm
+++ b/cpan/CPAN/lib/CPAN/Debug.pm
diff --git a/ext/CPAN/lib/CPAN/DeferredCode.pm b/cpan/CPAN/lib/CPAN/DeferredCode.pm
index 0db37a6485..0db37a6485 100644
--- a/ext/CPAN/lib/CPAN/DeferredCode.pm
+++ b/cpan/CPAN/lib/CPAN/DeferredCode.pm
diff --git a/ext/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
index 45192bdb9d..45192bdb9d 100644
--- a/ext/CPAN/lib/CPAN/Distribution.pm
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
diff --git a/ext/CPAN/lib/CPAN/Distroprefs.pm b/cpan/CPAN/lib/CPAN/Distroprefs.pm
index e1be9cdf74..e1be9cdf74 100644
--- a/ext/CPAN/lib/CPAN/Distroprefs.pm
+++ b/cpan/CPAN/lib/CPAN/Distroprefs.pm
diff --git a/ext/CPAN/lib/CPAN/Distrostatus.pm b/cpan/CPAN/lib/CPAN/Distrostatus.pm
index 0cc6cc9a79..0cc6cc9a79 100644
--- a/ext/CPAN/lib/CPAN/Distrostatus.pm
+++ b/cpan/CPAN/lib/CPAN/Distrostatus.pm
diff --git a/ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm b/cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm
index b928ad74e3..b928ad74e3 100644
--- a/ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm
+++ b/cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm
diff --git a/ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm b/cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm
index 102c194e61..102c194e61 100644
--- a/ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm
+++ b/cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm
diff --git a/ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm b/cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm
index e1259e5397..e1259e5397 100644
--- a/ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm
+++ b/cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm
diff --git a/ext/CPAN/lib/CPAN/FTP.pm b/cpan/CPAN/lib/CPAN/FTP.pm
index fab3d123ef..fab3d123ef 100644
--- a/ext/CPAN/lib/CPAN/FTP.pm
+++ b/cpan/CPAN/lib/CPAN/FTP.pm
diff --git a/ext/CPAN/lib/CPAN/FTP/netrc.pm b/cpan/CPAN/lib/CPAN/FTP/netrc.pm
index c05405e7ef..c05405e7ef 100644
--- a/ext/CPAN/lib/CPAN/FTP/netrc.pm
+++ b/cpan/CPAN/lib/CPAN/FTP/netrc.pm
diff --git a/ext/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
index 50bebc349a..50bebc349a 100644
--- a/ext/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
diff --git a/ext/CPAN/lib/CPAN/HandleConfig.pm b/cpan/CPAN/lib/CPAN/HandleConfig.pm
index 903b414464..903b414464 100644
--- a/ext/CPAN/lib/CPAN/HandleConfig.pm
+++ b/cpan/CPAN/lib/CPAN/HandleConfig.pm
diff --git a/ext/CPAN/lib/CPAN/Index.pm b/cpan/CPAN/lib/CPAN/Index.pm
index 3fa9e60229..3fa9e60229 100644
--- a/ext/CPAN/lib/CPAN/Index.pm
+++ b/cpan/CPAN/lib/CPAN/Index.pm
diff --git a/ext/CPAN/lib/CPAN/InfoObj.pm b/cpan/CPAN/lib/CPAN/InfoObj.pm
index 9198316c69..9198316c69 100644
--- a/ext/CPAN/lib/CPAN/InfoObj.pm
+++ b/cpan/CPAN/lib/CPAN/InfoObj.pm
diff --git a/ext/CPAN/lib/CPAN/Kwalify.pm b/cpan/CPAN/lib/CPAN/Kwalify.pm
index 3cade90b91..3cade90b91 100644
--- a/ext/CPAN/lib/CPAN/Kwalify.pm
+++ b/cpan/CPAN/lib/CPAN/Kwalify.pm
diff --git a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd
index fd046271b8..fd046271b8 100644
--- a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd
+++ b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd
diff --git a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml
index 431f174276..431f174276 100644
--- a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml
+++ b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml
diff --git a/ext/CPAN/lib/CPAN/LWP/UserAgent.pm b/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm
index 8a5d8447e6..8a5d8447e6 100644
--- a/ext/CPAN/lib/CPAN/LWP/UserAgent.pm
+++ b/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm
diff --git a/ext/CPAN/lib/CPAN/Module.pm b/cpan/CPAN/lib/CPAN/Module.pm
index eae5a73aaa..eae5a73aaa 100644
--- a/ext/CPAN/lib/CPAN/Module.pm
+++ b/cpan/CPAN/lib/CPAN/Module.pm
diff --git a/ext/CPAN/lib/CPAN/Nox.pm b/cpan/CPAN/lib/CPAN/Nox.pm
index 5fe5a25ae6..5fe5a25ae6 100644
--- a/ext/CPAN/lib/CPAN/Nox.pm
+++ b/cpan/CPAN/lib/CPAN/Nox.pm
diff --git a/ext/CPAN/lib/CPAN/PAUSE2003.pub b/cpan/CPAN/lib/CPAN/PAUSE2003.pub
index 7817562962..7817562962 100644
--- a/ext/CPAN/lib/CPAN/PAUSE2003.pub
+++ b/cpan/CPAN/lib/CPAN/PAUSE2003.pub
diff --git a/ext/CPAN/lib/CPAN/PAUSE2005.pub b/cpan/CPAN/lib/CPAN/PAUSE2005.pub
index 8b3324773c..8b3324773c 100644
--- a/ext/CPAN/lib/CPAN/PAUSE2005.pub
+++ b/cpan/CPAN/lib/CPAN/PAUSE2005.pub
diff --git a/ext/CPAN/lib/CPAN/PAUSE2007.pub b/cpan/CPAN/lib/CPAN/PAUSE2007.pub
index 49ab2dca93..49ab2dca93 100644
--- a/ext/CPAN/lib/CPAN/PAUSE2007.pub
+++ b/cpan/CPAN/lib/CPAN/PAUSE2007.pub
diff --git a/ext/CPAN/lib/CPAN/PAUSE2009.pub b/cpan/CPAN/lib/CPAN/PAUSE2009.pub
index fd76ec618c..fd76ec618c 100644
--- a/ext/CPAN/lib/CPAN/PAUSE2009.pub
+++ b/cpan/CPAN/lib/CPAN/PAUSE2009.pub
diff --git a/ext/CPAN/lib/CPAN/Prompt.pm b/cpan/CPAN/lib/CPAN/Prompt.pm
index 7a4e2d81e1..7a4e2d81e1 100644
--- a/ext/CPAN/lib/CPAN/Prompt.pm
+++ b/cpan/CPAN/lib/CPAN/Prompt.pm
diff --git a/ext/CPAN/lib/CPAN/Queue.pm b/cpan/CPAN/lib/CPAN/Queue.pm
index b60f57c1cf..b60f57c1cf 100644
--- a/ext/CPAN/lib/CPAN/Queue.pm
+++ b/cpan/CPAN/lib/CPAN/Queue.pm
diff --git a/ext/CPAN/lib/CPAN/SIGNATURE b/cpan/CPAN/lib/CPAN/SIGNATURE
index 286b255575..286b255575 100644
--- a/ext/CPAN/lib/CPAN/SIGNATURE
+++ b/cpan/CPAN/lib/CPAN/SIGNATURE
diff --git a/ext/CPAN/lib/CPAN/Shell.pm b/cpan/CPAN/lib/CPAN/Shell.pm
index 84f67ffafb..84f67ffafb 100644
--- a/ext/CPAN/lib/CPAN/Shell.pm
+++ b/cpan/CPAN/lib/CPAN/Shell.pm
diff --git a/ext/CPAN/lib/CPAN/Tarzip.pm b/cpan/CPAN/lib/CPAN/Tarzip.pm
index 17b3cd748d..17b3cd748d 100644
--- a/ext/CPAN/lib/CPAN/Tarzip.pm
+++ b/cpan/CPAN/lib/CPAN/Tarzip.pm
diff --git a/ext/CPAN/lib/CPAN/URL.pm b/cpan/CPAN/lib/CPAN/URL.pm
index 52b42eec88..52b42eec88 100644
--- a/ext/CPAN/lib/CPAN/URL.pm
+++ b/cpan/CPAN/lib/CPAN/URL.pm
diff --git a/ext/CPAN/lib/CPAN/Version.pm b/cpan/CPAN/lib/CPAN/Version.pm
index da876aac2d..da876aac2d 100644
--- a/ext/CPAN/lib/CPAN/Version.pm
+++ b/cpan/CPAN/lib/CPAN/Version.pm
diff --git a/ext/CPAN/scripts/cpan b/cpan/CPAN/scripts/cpan
index d06666e78f..d06666e78f 100644
--- a/ext/CPAN/scripts/cpan
+++ b/cpan/CPAN/scripts/cpan
diff --git a/ext/CPAN/t/01loadme.t b/cpan/CPAN/t/01loadme.t
index c22589b656..c22589b656 100644
--- a/ext/CPAN/t/01loadme.t
+++ b/cpan/CPAN/t/01loadme.t
diff --git a/ext/CPAN/t/02nox.t b/cpan/CPAN/t/02nox.t
index 15eae05fa8..15eae05fa8 100644
--- a/ext/CPAN/t/02nox.t
+++ b/cpan/CPAN/t/02nox.t
diff --git a/ext/CPAN/t/03pkgs.t b/cpan/CPAN/t/03pkgs.t
index 1d877fc4a1..1d877fc4a1 100644
--- a/ext/CPAN/t/03pkgs.t
+++ b/cpan/CPAN/t/03pkgs.t
diff --git a/ext/CPAN/t/10version.t b/cpan/CPAN/t/10version.t
index c1199e99a7..c1199e99a7 100644
--- a/ext/CPAN/t/10version.t
+++ b/cpan/CPAN/t/10version.t
diff --git a/ext/CPAN/t/11mirroredby.t b/cpan/CPAN/t/11mirroredby.t
index 840dfa3a51..840dfa3a51 100644
--- a/ext/CPAN/t/11mirroredby.t
+++ b/cpan/CPAN/t/11mirroredby.t
diff --git a/utils/cpan.PL b/utils/cpan.PL
index 4752843fc5..c7c26685db 100644
--- a/utils/cpan.PL
+++ b/utils/cpan.PL
@@ -33,7 +33,7 @@ $Config{startperl}
 
 use File::Spec;
 
-my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "ext", "CPAN", "scripts"), "cpan");
+my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, qw(cpan CPAN scripts)), "cpan");
 
 if (open(CPAN, $cpan)) {
     print OUT <CPAN>;