69 files changed, 68 insertions, 68 deletions

diff --git a/MANIFEST b/MANIFEST
index 5a77a2564e..a7a8c5ecc0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -569,6 +569,72 @@ cpan/Math-Complex/lib/Math/Trig.pm	A simple interface to complex trigonometry
 cpan/Math-Complex/t/Complex.t		See if Math::Complex works
 cpan/Math-Complex/t/Trig.t		See if Math::Trig works
 cpan/Math-Complex/t/underbar.t		See if Math::Complex works
+cpan/Module-Build/Changes				Module::Build
+cpan/Module-Build/lib/Module/Build/API.pod		Module::Build
+cpan/Module-Build/lib/Module/Build/Authoring.pod	Module::Build
+cpan/Module-Build/lib/Module/Build/Base.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Compat.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Config.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Cookbook.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Dumper.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/ModuleInfo.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Notes.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/aix.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/darwin.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/Default.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/os2.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/Unix.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/VMS.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/VOS.pm	Module::Build
+cpan/Module-Build/lib/Module/Build/Platform/Windows.pm	Module::Build
+cpan/Module-Build/lib/Module/Build.pm			Module::Build
+cpan/Module-Build/lib/Module/Build/PodParser.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/PPMMaker.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/Version.pm		Module::Build
+cpan/Module-Build/lib/Module/Build/YAML.pm		Module::Build
+cpan/Module-Build/scripts/config_data			Module::Build
+cpan/Module-Build/t/add_property.t			Module::Build
+cpan/Module-Build/t/basic.t				Module::Build
+cpan/Module-Build/t/bundled/Tie/CPHash.pm		Module::Build.pm
+cpan/Module-Build/t/compat/exit.t			Module::Build
+cpan/Module-Build/t/compat.t				Module::Build
+cpan/Module-Build/t/debug.t				Module::Build tests
+cpan/Module-Build/t/destinations.t			Module::Build
+cpan/Module-Build/t/extend.t				Module::Build
+cpan/Module-Build/t/ext.t				Module::Build
+cpan/Module-Build/t/files.t				Module::Build
+cpan/Module-Build/t/help.t				Module::Build
+cpan/Module-Build/t/install_extra_target.t		Module::Build tests
+cpan/Module-Build/t/install.t				Module::Build
+cpan/Module-Build/t/lib/DistGen.pm			Module::Build
+cpan/Module-Build/t/lib/MBTest.pm			Module::Build
+cpan/Module-Build/t/manifypods.t			Module::Build
+cpan/Module-Build/t/mbyaml.t				Module::Build
+cpan/Module-Build/t/metadata2.t				Module::Build
+cpan/Module-Build/t/metadata.t				Module::Build
+cpan/Module-Build/t/moduleinfo.t			Module::Build
+cpan/Module-Build/t/new_from_context.t			Module::Build
+cpan/Module-Build/t/notes.t				Module::Build
+cpan/Module-Build/t/parents.t				Module::Build
+cpan/Module-Build/t/PL_files.t				Module::Build tests
+cpan/Module-Build/t/pod_parser.t			Module::Build
+cpan/Module-Build/t/ppm.t				Module::Build
+cpan/Module-Build/t/runthrough.t			Module::Build
+cpan/Module-Build/t/script_dist.t			Module::Build
+cpan/Module-Build/t/test_file_exts.t			Module::Build
+cpan/Module-Build/t/test_types.t			Module::Build
+cpan/Module-Build/t/test_type.t				Module::Build
+cpan/Module-Build/t/tilde.t				Module::Build
+cpan/Module-Build/t/use_tap_harness.t			Module::Build
+cpan/Module-Build/t/versions.t				Module::Build
+cpan/Module-Build/t/write_default_maniskip.t		Module::Build tests
+cpan/Module-Build/t/xs.t				Module::Build
 cpan/Sys-Syslog/Changes			Changlog for Sys::Syslog
 cpan/Sys-Syslog/fallback/const-c.inc	Sys::Syslog constants fallback file
 cpan/Sys-Syslog/fallback/const-xs.inc	Sys::Syslog constants fallback file
@@ -1858,72 +1924,6 @@ ext/MIME-Base64/t/base64.t	See whether MIME::Base64 works
 ext/MIME-Base64/t/quoted-print.t	See whether MIME::QuotedPrint works
 ext/MIME-Base64/t/unicode.t	See whether MIME::Base64 works
 ext/MIME-Base64/t/warn.t	See whether MIME::Base64 works
-ext/Module-Build/Changes				Module::Build
-ext/Module-Build/lib/Module/Build/API.pod		Module::Build
-ext/Module-Build/lib/Module/Build/Authoring.pod		Module::Build
-ext/Module-Build/lib/Module/Build/Base.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Compat.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Config.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Cookbook.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Dumper.pm		Module::Build
-ext/Module-Build/lib/Module/Build/ModuleInfo.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Notes.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Platform/aix.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/Amiga.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/cygwin.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/darwin.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/Default.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/MacOS.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/os2.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/Unix.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/VMS.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/VOS.pm	Module::Build
-ext/Module-Build/lib/Module/Build/Platform/Windows.pm	Module::Build
-ext/Module-Build/lib/Module/Build.pm			Module::Build
-ext/Module-Build/lib/Module/Build/PodParser.pm		Module::Build
-ext/Module-Build/lib/Module/Build/PPMMaker.pm		Module::Build
-ext/Module-Build/lib/Module/Build/Version.pm		Module::Build
-ext/Module-Build/lib/Module/Build/YAML.pm		Module::Build
-ext/Module-Build/scripts/config_data			Module::Build
-ext/Module-Build/t/add_property.t			Module::Build
-ext/Module-Build/t/basic.t				Module::Build
-ext/Module-Build/t/bundled/Tie/CPHash.pm		Module::Build.pm
-ext/Module-Build/t/compat/exit.t			Module::Build
-ext/Module-Build/t/compat.t				Module::Build
-ext/Module-Build/t/debug.t				Module::Build tests
-ext/Module-Build/t/destinations.t			Module::Build
-ext/Module-Build/t/extend.t				Module::Build
-ext/Module-Build/t/ext.t				Module::Build
-ext/Module-Build/t/files.t				Module::Build
-ext/Module-Build/t/help.t				Module::Build
-ext/Module-Build/t/install_extra_target.t		Module::Build tests
-ext/Module-Build/t/install.t				Module::Build
-ext/Module-Build/t/lib/DistGen.pm			Module::Build
-ext/Module-Build/t/lib/MBTest.pm			Module::Build
-ext/Module-Build/t/manifypods.t				Module::Build
-ext/Module-Build/t/mbyaml.t				Module::Build
-ext/Module-Build/t/metadata2.t				Module::Build
-ext/Module-Build/t/metadata.t				Module::Build
-ext/Module-Build/t/moduleinfo.t				Module::Build
-ext/Module-Build/t/new_from_context.t			Module::Build
-ext/Module-Build/t/notes.t				Module::Build
-ext/Module-Build/t/parents.t				Module::Build
-ext/Module-Build/t/PL_files.t				Module::Build tests
-ext/Module-Build/t/pod_parser.t				Module::Build
-ext/Module-Build/t/ppm.t				Module::Build
-ext/Module-Build/t/runthrough.t				Module::Build
-ext/Module-Build/t/script_dist.t			Module::Build
-ext/Module-Build/t/test_file_exts.t			Module::Build
-ext/Module-Build/t/test_types.t				Module::Build
-ext/Module-Build/t/test_type.t				Module::Build
-ext/Module-Build/t/tilde.t				Module::Build
-ext/Module-Build/t/use_tap_harness.t			Module::Build
-ext/Module-Build/t/versions.t				Module::Build
-ext/Module-Build/t/write_default_maniskip.t		Module::Build tests
-ext/Module-Build/t/xs.t					Module::Build
 ext/Module-CoreList/Changes	Module::CoreList Changes
 ext/Module-CoreList/corelist	The corelist command-line utility
 ext/Module-CoreList/identify-dependencies	A usage example for Module::CoreList
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 820fe3765e..12c4590af9 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -994,7 +994,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/Module-Build-0.35.tar.gz',
-	'FILES'		=> q[ext/Module-Build],
+	'FILES'		=> q[cpan/Module-Build],
 	'EXCLUDED'	=> [ qw{ t/par.t t/signature.t scripts/bundle.pl},
 			     qr!^contrib/! ],
 	'CPAN'		=> 1,
diff --git a/ext/Module-Build/Changes b/cpan/Module-Build/Changes
index df66502dbd..df66502dbd 100644
--- a/ext/Module-Build/Changes
+++ b/cpan/Module-Build/Changes
diff --git a/ext/Module-Build/lib/Module/Build.pm b/cpan/Module-Build/lib/Module/Build.pm
index be8c1f7079..be8c1f7079 100644
--- a/ext/Module-Build/lib/Module/Build.pm
+++ b/cpan/Module-Build/lib/Module/Build.pm
diff --git a/ext/Module-Build/lib/Module/Build/API.pod b/cpan/Module-Build/lib/Module/Build/API.pod
index f4e4cea09d..f4e4cea09d 100644
--- a/ext/Module-Build/lib/Module/Build/API.pod
+++ b/cpan/Module-Build/lib/Module/Build/API.pod
diff --git a/ext/Module-Build/lib/Module/Build/Authoring.pod b/cpan/Module-Build/lib/Module/Build/Authoring.pod
index 38fb3f089a..38fb3f089a 100644
--- a/ext/Module-Build/lib/Module/Build/Authoring.pod
+++ b/cpan/Module-Build/lib/Module/Build/Authoring.pod
diff --git a/ext/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
index 531c35487e..531c35487e 100644
--- a/ext/Module-Build/lib/Module/Build/Base.pm
+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
diff --git a/ext/Module-Build/lib/Module/Build/Compat.pm b/cpan/Module-Build/lib/Module/Build/Compat.pm
index dfe75d5e1a..dfe75d5e1a 100644
--- a/ext/Module-Build/lib/Module/Build/Compat.pm
+++ b/cpan/Module-Build/lib/Module/Build/Compat.pm
diff --git a/ext/Module-Build/lib/Module/Build/Config.pm b/cpan/Module-Build/lib/Module/Build/Config.pm
index de8b44d092..de8b44d092 100644
--- a/ext/Module-Build/lib/Module/Build/Config.pm
+++ b/cpan/Module-Build/lib/Module/Build/Config.pm
diff --git a/ext/Module-Build/lib/Module/Build/Cookbook.pm b/cpan/Module-Build/lib/Module/Build/Cookbook.pm
index 82c8e01d67..82c8e01d67 100644
--- a/ext/Module-Build/lib/Module/Build/Cookbook.pm
+++ b/cpan/Module-Build/lib/Module/Build/Cookbook.pm
diff --git a/ext/Module-Build/lib/Module/Build/Dumper.pm b/cpan/Module-Build/lib/Module/Build/Dumper.pm
index 1cd8cd0e16..1cd8cd0e16 100644
--- a/ext/Module-Build/lib/Module/Build/Dumper.pm
+++ b/cpan/Module-Build/lib/Module/Build/Dumper.pm
diff --git a/ext/Module-Build/lib/Module/Build/ModuleInfo.pm b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
index 4de09b4c68..4de09b4c68 100644
--- a/ext/Module-Build/lib/Module/Build/ModuleInfo.pm
+++ b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
diff --git a/ext/Module-Build/lib/Module/Build/Notes.pm b/cpan/Module-Build/lib/Module/Build/Notes.pm
index fe98419759..fe98419759 100644
--- a/ext/Module-Build/lib/Module/Build/Notes.pm
+++ b/cpan/Module-Build/lib/Module/Build/Notes.pm
diff --git a/ext/Module-Build/lib/Module/Build/PPMMaker.pm b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm
index 35b5a75317..35b5a75317 100644
--- a/ext/Module-Build/lib/Module/Build/PPMMaker.pm
+++ b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/Amiga.pm b/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm
index 5ce8cf58a2..5ce8cf58a2 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/Amiga.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/Default.pm b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
index df29af5f68..df29af5f68 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/Default.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm b/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm
index d68836c1a3..d68836c1a3 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/EBCDIC.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm b/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm
index a835c30d49..a835c30d49 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/MPEiX.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/MacOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
index 9c9281adac..9c9281adac 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/MacOS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm
index c240750c46..c240750c46 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/RiscOS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/Unix.pm b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
index 879ca3ad4e..879ca3ad4e 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/Unix.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/VMS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
index 3305154b2d..3305154b2d 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/VMS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/VOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
index be46a80416..be46a80416 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/VOS.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/Windows.pm b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
index 6cf9da9cc3..6cf9da9cc3 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/Windows.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/aix.pm b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
index 45feb3cdd4..45feb3cdd4 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/aix.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/cygwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
index 62a6461ce2..62a6461ce2 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/cygwin.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/darwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
index 39e9e36911..39e9e36911 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/darwin.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
diff --git a/ext/Module-Build/lib/Module/Build/Platform/os2.pm b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
index ace01a3291..ace01a3291 100644
--- a/ext/Module-Build/lib/Module/Build/Platform/os2.pm
+++ b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
diff --git a/ext/Module-Build/lib/Module/Build/PodParser.pm b/cpan/Module-Build/lib/Module/Build/PodParser.pm
index b17b80b189..b17b80b189 100644
--- a/ext/Module-Build/lib/Module/Build/PodParser.pm
+++ b/cpan/Module-Build/lib/Module/Build/PodParser.pm
diff --git a/ext/Module-Build/lib/Module/Build/Version.pm b/cpan/Module-Build/lib/Module/Build/Version.pm
index 0664d432ab..0664d432ab 100644
--- a/ext/Module-Build/lib/Module/Build/Version.pm
+++ b/cpan/Module-Build/lib/Module/Build/Version.pm
diff --git a/ext/Module-Build/lib/Module/Build/YAML.pm b/cpan/Module-Build/lib/Module/Build/YAML.pm
index 4a181ad1c9..4a181ad1c9 100644
--- a/ext/Module-Build/lib/Module/Build/YAML.pm
+++ b/cpan/Module-Build/lib/Module/Build/YAML.pm
diff --git a/ext/Module-Build/scripts/config_data b/cpan/Module-Build/scripts/config_data
index 374922f20c..374922f20c 100644
--- a/ext/Module-Build/scripts/config_data
+++ b/cpan/Module-Build/scripts/config_data
diff --git a/ext/Module-Build/t/PL_files.t b/cpan/Module-Build/t/PL_files.t
index a22171458c..a22171458c 100644
--- a/ext/Module-Build/t/PL_files.t
+++ b/cpan/Module-Build/t/PL_files.t
diff --git a/ext/Module-Build/t/add_property.t b/cpan/Module-Build/t/add_property.t
index 6032b0929d..6032b0929d 100644
--- a/ext/Module-Build/t/add_property.t
+++ b/cpan/Module-Build/t/add_property.t
diff --git a/ext/Module-Build/t/basic.t b/cpan/Module-Build/t/basic.t
index f46be0a4c9..f46be0a4c9 100644
--- a/ext/Module-Build/t/basic.t
+++ b/cpan/Module-Build/t/basic.t
diff --git a/ext/Module-Build/t/bundled/Tie/CPHash.pm b/cpan/Module-Build/t/bundled/Tie/CPHash.pm
index 36aea85a8c..36aea85a8c 100644
--- a/ext/Module-Build/t/bundled/Tie/CPHash.pm
+++ b/cpan/Module-Build/t/bundled/Tie/CPHash.pm
diff --git a/ext/Module-Build/t/compat.t b/cpan/Module-Build/t/compat.t
index 88e5953408..88e5953408 100644
--- a/ext/Module-Build/t/compat.t
+++ b/cpan/Module-Build/t/compat.t
diff --git a/ext/Module-Build/t/compat/exit.t b/cpan/Module-Build/t/compat/exit.t
index 78269a97a3..78269a97a3 100644
--- a/ext/Module-Build/t/compat/exit.t
+++ b/cpan/Module-Build/t/compat/exit.t
diff --git a/ext/Module-Build/t/debug.t b/cpan/Module-Build/t/debug.t
index c9b4fa581c..c9b4fa581c 100644
--- a/ext/Module-Build/t/debug.t
+++ b/cpan/Module-Build/t/debug.t
diff --git a/ext/Module-Build/t/destinations.t b/cpan/Module-Build/t/destinations.t
index 4af99d0031..4af99d0031 100644
--- a/ext/Module-Build/t/destinations.t
+++ b/cpan/Module-Build/t/destinations.t
diff --git a/ext/Module-Build/t/ext.t b/cpan/Module-Build/t/ext.t
index 8045761c2a..8045761c2a 100644
--- a/ext/Module-Build/t/ext.t
+++ b/cpan/Module-Build/t/ext.t
diff --git a/ext/Module-Build/t/extend.t b/cpan/Module-Build/t/extend.t
index db99eec70b..db99eec70b 100644
--- a/ext/Module-Build/t/extend.t
+++ b/cpan/Module-Build/t/extend.t
diff --git a/ext/Module-Build/t/files.t b/cpan/Module-Build/t/files.t
index 87b192eaba..87b192eaba 100644
--- a/ext/Module-Build/t/files.t
+++ b/cpan/Module-Build/t/files.t
diff --git a/ext/Module-Build/t/help.t b/cpan/Module-Build/t/help.t
index 8408315f07..8408315f07 100644
--- a/ext/Module-Build/t/help.t
+++ b/cpan/Module-Build/t/help.t
diff --git a/ext/Module-Build/t/install.t b/cpan/Module-Build/t/install.t
index 2cadaa39da..2cadaa39da 100644
--- a/ext/Module-Build/t/install.t
+++ b/cpan/Module-Build/t/install.t
diff --git a/ext/Module-Build/t/install_extra_target.t b/cpan/Module-Build/t/install_extra_target.t
index c717ce5eee..c717ce5eee 100644
--- a/ext/Module-Build/t/install_extra_target.t
+++ b/cpan/Module-Build/t/install_extra_target.t
diff --git a/ext/Module-Build/t/lib/DistGen.pm b/cpan/Module-Build/t/lib/DistGen.pm
index 86ee794f3b..86ee794f3b 100644
--- a/ext/Module-Build/t/lib/DistGen.pm
+++ b/cpan/Module-Build/t/lib/DistGen.pm
diff --git a/ext/Module-Build/t/lib/MBTest.pm b/cpan/Module-Build/t/lib/MBTest.pm
index dc2410b399..dc2410b399 100644
--- a/ext/Module-Build/t/lib/MBTest.pm
+++ b/cpan/Module-Build/t/lib/MBTest.pm
diff --git a/ext/Module-Build/t/manifypods.t b/cpan/Module-Build/t/manifypods.t
index 31c9e8ea83..31c9e8ea83 100644
--- a/ext/Module-Build/t/manifypods.t
+++ b/cpan/Module-Build/t/manifypods.t
diff --git a/ext/Module-Build/t/mbyaml.t b/cpan/Module-Build/t/mbyaml.t
index d2cb0d547f..d2cb0d547f 100644
--- a/ext/Module-Build/t/mbyaml.t
+++ b/cpan/Module-Build/t/mbyaml.t
diff --git a/ext/Module-Build/t/metadata.t b/cpan/Module-Build/t/metadata.t
index 6f53c1d225..6f53c1d225 100644
--- a/ext/Module-Build/t/metadata.t
+++ b/cpan/Module-Build/t/metadata.t
diff --git a/ext/Module-Build/t/metadata2.t b/cpan/Module-Build/t/metadata2.t
index a5af034dc0..a5af034dc0 100644
--- a/ext/Module-Build/t/metadata2.t
+++ b/cpan/Module-Build/t/metadata2.t
diff --git a/ext/Module-Build/t/moduleinfo.t b/cpan/Module-Build/t/moduleinfo.t
index ca7eb048e5..ca7eb048e5 100644
--- a/ext/Module-Build/t/moduleinfo.t
+++ b/cpan/Module-Build/t/moduleinfo.t
diff --git a/ext/Module-Build/t/new_from_context.t b/cpan/Module-Build/t/new_from_context.t
index ee34f07367..ee34f07367 100644
--- a/ext/Module-Build/t/new_from_context.t
+++ b/cpan/Module-Build/t/new_from_context.t
diff --git a/ext/Module-Build/t/notes.t b/cpan/Module-Build/t/notes.t
index 29f1fc38b1..29f1fc38b1 100644
--- a/ext/Module-Build/t/notes.t
+++ b/cpan/Module-Build/t/notes.t
diff --git a/ext/Module-Build/t/parents.t b/cpan/Module-Build/t/parents.t
index 666fb05601..666fb05601 100644
--- a/ext/Module-Build/t/parents.t
+++ b/cpan/Module-Build/t/parents.t
diff --git a/ext/Module-Build/t/pod_parser.t b/cpan/Module-Build/t/pod_parser.t
index 42a78209e2..42a78209e2 100644
--- a/ext/Module-Build/t/pod_parser.t
+++ b/cpan/Module-Build/t/pod_parser.t
diff --git a/ext/Module-Build/t/ppm.t b/cpan/Module-Build/t/ppm.t
index 7fb6450648..7fb6450648 100644
--- a/ext/Module-Build/t/ppm.t
+++ b/cpan/Module-Build/t/ppm.t
diff --git a/ext/Module-Build/t/runthrough.t b/cpan/Module-Build/t/runthrough.t
index 21d3d1c113..21d3d1c113 100644
--- a/ext/Module-Build/t/runthrough.t
+++ b/cpan/Module-Build/t/runthrough.t
diff --git a/ext/Module-Build/t/script_dist.t b/cpan/Module-Build/t/script_dist.t
index e6b7fd8832..e6b7fd8832 100644
--- a/ext/Module-Build/t/script_dist.t
+++ b/cpan/Module-Build/t/script_dist.t
diff --git a/ext/Module-Build/t/test_file_exts.t b/cpan/Module-Build/t/test_file_exts.t
index 9dbf73e290..9dbf73e290 100644
--- a/ext/Module-Build/t/test_file_exts.t
+++ b/cpan/Module-Build/t/test_file_exts.t
diff --git a/ext/Module-Build/t/test_type.t b/cpan/Module-Build/t/test_type.t
index 3c6cfb61e4..3c6cfb61e4 100644
--- a/ext/Module-Build/t/test_type.t
+++ b/cpan/Module-Build/t/test_type.t
diff --git a/ext/Module-Build/t/test_types.t b/cpan/Module-Build/t/test_types.t
index 5f3f5cff8d..5f3f5cff8d 100644
--- a/ext/Module-Build/t/test_types.t
+++ b/cpan/Module-Build/t/test_types.t
diff --git a/ext/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t
index 5b39204171..5b39204171 100644
--- a/ext/Module-Build/t/tilde.t
+++ b/cpan/Module-Build/t/tilde.t
diff --git a/ext/Module-Build/t/use_tap_harness.t b/cpan/Module-Build/t/use_tap_harness.t
index d14cb052ba..d14cb052ba 100644
--- a/ext/Module-Build/t/use_tap_harness.t
+++ b/cpan/Module-Build/t/use_tap_harness.t
diff --git a/ext/Module-Build/t/versions.t b/cpan/Module-Build/t/versions.t
index 7f511e58f6..7f511e58f6 100644
--- a/ext/Module-Build/t/versions.t
+++ b/cpan/Module-Build/t/versions.t
diff --git a/ext/Module-Build/t/write_default_maniskip.t b/cpan/Module-Build/t/write_default_maniskip.t
index 084d81ed3e..084d81ed3e 100644
--- a/ext/Module-Build/t/write_default_maniskip.t
+++ b/cpan/Module-Build/t/write_default_maniskip.t
diff --git a/ext/Module-Build/t/xs.t b/cpan/Module-Build/t/xs.t
index e3f1ed7dd1..e3f1ed7dd1 100644
--- a/ext/Module-Build/t/xs.t
+++ b/cpan/Module-Build/t/xs.t
diff --git a/utils/config_data.PL b/utils/config_data.PL
index e8dda916fb..a7bc90fb80 100644
--- a/utils/config_data.PL
+++ b/utils/config_data.PL
@@ -35,7 +35,7 @@ use File::Spec;
 
 my $script = File::Spec->catfile(
             File::Spec->catdir(
-                File::Spec->updir, qw[ext Module-Build scripts]
+                File::Spec->updir, qw[cpan Module-Build scripts]
             ), "config_data");
 
 if (open(IN, $script)) {