diff --git a/.gitignore b/.gitignore
index a968c028..48cc642b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /Module-Build-*
 /LICENSE
 /README
+.build
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 525bf555..00000000
--- a/MANIFEST
+++ /dev/null
@@ -1,97 +0,0 @@
-bin/config_data
-Build.PL
-Changes
-contrib/bash_completion.module-build
-inc/bootstrap.pl
-inc/MBVersion.pm
-inc/Module/Metadata.pm
-inc/Perl/OSType.pm
-INSTALL
-lib/inc/latest.pm
-lib/inc/latest/private.pm
-lib/Module/Build.pm
-lib/Module/Build/API.pod
-lib/Module/Build/Authoring.pod
-lib/Module/Build/Base.pm
-lib/Module/Build/Bundling.pod
-lib/Module/Build/Compat.pm
-lib/Module/Build/Config.pm
-lib/Module/Build/Cookbook.pm
-lib/Module/Build/Dumper.pm
-lib/Module/Build/ModuleInfo.pm
-lib/Module/Build/Notes.pm
-lib/Module/Build/Platform/aix.pm
-lib/Module/Build/Platform/cygwin.pm
-lib/Module/Build/Platform/darwin.pm
-lib/Module/Build/Platform/Default.pm
-lib/Module/Build/Platform/MacOS.pm
-lib/Module/Build/Platform/os2.pm
-lib/Module/Build/Platform/Unix.pm
-lib/Module/Build/Platform/VMS.pm
-lib/Module/Build/Platform/VOS.pm
-lib/Module/Build/Platform/Windows.pm
-lib/Module/Build/PodParser.pm
-lib/Module/Build/PPMMaker.pm
-lib/Module/Build/Version.pm
-lib/Module/Build/YAML.pm
-LICENSE
-Makefile.PL
-MANIFEST
-META.json
-META.yml
-README
-t/00-compile.t
-t/actions/installdeps.t
-t/actions/manifest_skip.t
-t/add_property.t
-t/basic.t
-t/bundle_inc.t
-t/bundled/Software/License.pm
-t/bundled/Tie/CPHash.pm
-t/compat.t
-t/compat/exit.t
-t/debug.t
-t/destinations.t
-t/ext.t
-t/extend.t
-t/files.t
-t/help.t
-t/install.t
-t/install_extra_target.t
-t/lib/DistGen.pm
-t/lib/MBTest.pm
-t/lib/Module/Signature.pm
-t/lib/Software/License/VaporWare.pm
-t/manifypods.t
-t/metadata.t
-t/metadata2.t
-t/mymeta.t
-t/new_from_context.t
-t/notes.t
-t/par.t
-t/parents.t
-t/perl_mb_opt.t
-t/PL_files.t
-t/pod_parser.t
-t/ppm.t
-t/properties/dist_suffix.t
-t/properties/license.t
-t/properties/module_name.t
-t/properties/needs_compiler.t
-t/properties/release_status.t
-t/properties/requires.t
-t/properties/share_dir.t
-t/README.pod
-t/resume.t
-t/runthrough.t
-t/sample.t
-t/script_dist.t
-t/signature.t
-t/test_file_exts.t
-t/test_type.t
-t/test_types.t
-t/tilde.t
-t/use_tap_harness.t
-t/versions.t
-t/write_default_maniskip.t
-t/xs.t
diff --git a/dist.ini b/dist.ini
new file mode 100644
index 00000000..029edae1
--- /dev/null
+++ b/dist.ini
@@ -0,0 +1,32 @@
+name    = Module-Build
+version = 0.4005
+author  = Ken Williams <kwilliams@cpan.org>
+license = Perl_5
+copyright_holder = Ken Williams
+
+[@Filter]
+-bundle = @Basic
+-remove = MakeMaker
+
+[MetaJSON]
+
+[PkgVersion]
+[PodVersion]
+
+[PruneFiles]
+match = ~$
+match = ^Module-Build
+
+[Signature]
+[Bugtracker]
+web = https://github.com/Perl-Toolchain-Gang/%s/issues
+
+[Repository]
+;[InstallGuide]
+
+[Test::Perl::Critic]
+[PodCoverageTests]
+
+[AutoPrereqs]
+
+[Git::Tag]
diff --git a/lib/Module/Build.pm b/lib/Module/Build.pm
index e3022919..b2d319ba 100644
--- a/lib/Module/Build.pm
+++ b/lib/Module/Build.pm
@@ -1,5 +1,6 @@
 package Module::Build;
-
+use vars qw($VERSION);
+$VERSION = '0.4005';
 use if $] >= 5.019, 'deprecate';
 
 # This module doesn't do much of anything itself, it inherits from the
@@ -16,10 +17,8 @@ use Perl::OSType ();
 
 use Module::Build::Base;
 
-use vars qw($VERSION @ISA);
+use vars qw(@ISA);
 @ISA = qw(Module::Build::Base);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 
 # Inserts the given module into the @ISA hierarchy between
 # Module::Build and its immediate parent
diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm
index 6fd6bd6f..55f012d3 100644
--- a/lib/Module/Build/Base.pm
+++ b/lib/Module/Build/Base.pm
@@ -1,13 +1,11 @@
 # -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
 # vim:ts=8:sw=2:et:sta:sts=2
 package Module::Build::Base;
+use vars qw($VERSION);
+$VERSION = '0.4005';
 
 use strict;
-use vars qw($VERSION);
 use warnings;
-
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 BEGIN { require 5.006001 }
 
 use Carp;
diff --git a/lib/Module/Build/Compat.pm b/lib/Module/Build/Compat.pm
index 0dc49d80..968b6acb 100644
--- a/lib/Module/Build/Compat.pm
+++ b/lib/Module/Build/Compat.pm
@@ -1,9 +1,6 @@
 package Module::Build::Compat;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-
 use File::Basename ();
 use File::Spec;
 use Config;
diff --git a/lib/Module/Build/Config.pm b/lib/Module/Build/Config.pm
index 9bb5e541..ccf58d90 100644
--- a/lib/Module/Build/Config.pm
+++ b/lib/Module/Build/Config.pm
@@ -1,9 +1,6 @@
 package Module::Build::Config;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Config;
 
 sub new {
diff --git a/lib/Module/Build/Cookbook.pm b/lib/Module/Build/Cookbook.pm
index 84ef43a3..76a67d8c 100644
--- a/lib/Module/Build/Cookbook.pm
+++ b/lib/Module/Build/Cookbook.pm
@@ -1,8 +1,5 @@
 package Module::Build::Cookbook;
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-
 
 =head1 NAME
 
diff --git a/lib/Module/Build/Dumper.pm b/lib/Module/Build/Dumper.pm
index 7db62622..16a79903 100644
--- a/lib/Module/Build/Dumper.pm
+++ b/lib/Module/Build/Dumper.pm
@@ -1,7 +1,5 @@
 package Module::Build::Dumper;
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
 
 # This is just a split-out of a wrapper function to do Data::Dumper
 # stuff "the right way".  See:
diff --git a/lib/Module/Build/ModuleInfo.pm b/lib/Module/Build/ModuleInfo.pm
index 9309fe83..7b4a55f9 100644
--- a/lib/Module/Build/ModuleInfo.pm
+++ b/lib/Module/Build/ModuleInfo.pm
@@ -3,10 +3,6 @@
 package Module::Build::ModuleInfo;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
-
 require Module::Metadata;
 our @ISA = qw/Module::Metadata/;
 
diff --git a/lib/Module/Build/Notes.pm b/lib/Module/Build/Notes.pm
index 2baef025..84cae419 100644
--- a/lib/Module/Build/Notes.pm
+++ b/lib/Module/Build/Notes.pm
@@ -3,9 +3,6 @@ package Module::Build::Notes;
 # A class for persistent hashes
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Data::Dumper;
 use Module::Build::Dumper;
 
diff --git a/lib/Module/Build/PPMMaker.pm b/lib/Module/Build/PPMMaker.pm
index c0eb7606..a415cef7 100644
--- a/lib/Module/Build/PPMMaker.pm
+++ b/lib/Module/Build/PPMMaker.pm
@@ -2,10 +2,6 @@ package Module::Build::PPMMaker;
 
 use strict;
 use Config;
-use vars qw($VERSION);
-
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 
 # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a
 # few tweaks based on the PPD spec at
diff --git a/lib/Module/Build/Platform/Default.pm b/lib/Module/Build/Platform/Default.pm
index db6a63d6..c60e21cd 100644
--- a/lib/Module/Build/Platform/Default.pm
+++ b/lib/Module/Build/Platform/Default.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::Default;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Base;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/MacOS.pm b/lib/Module/Build/Platform/MacOS.pm
index e72ee77c..ebd38371 100644
--- a/lib/Module/Build/Platform/MacOS.pm
+++ b/lib/Module/Build/Platform/MacOS.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::MacOS;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Base;
 use vars qw(@ISA);
 @ISA = qw(Module::Build::Base);
diff --git a/lib/Module/Build/Platform/Unix.pm b/lib/Module/Build/Platform/Unix.pm
index 2b514e44..88911755 100644
--- a/lib/Module/Build/Platform/Unix.pm
+++ b/lib/Module/Build/Platform/Unix.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::Unix;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Base;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/VMS.pm b/lib/Module/Build/Platform/VMS.pm
index d447fbce..64e80af1 100644
--- a/lib/Module/Build/Platform/VMS.pm
+++ b/lib/Module/Build/Platform/VMS.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::VMS;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Base;
 use Config;
 
diff --git a/lib/Module/Build/Platform/VOS.pm b/lib/Module/Build/Platform/VOS.pm
index db94bf44..2bd5f79a 100644
--- a/lib/Module/Build/Platform/VOS.pm
+++ b/lib/Module/Build/Platform/VOS.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::VOS;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Base;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/Windows.pm b/lib/Module/Build/Platform/Windows.pm
index 3b60ea07..7ae45017 100644
--- a/lib/Module/Build/Platform/Windows.pm
+++ b/lib/Module/Build/Platform/Windows.pm
@@ -1,10 +1,6 @@
 package Module::Build::Platform::Windows;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
-
 use Config;
 use File::Basename;
 use File::Spec;
diff --git a/lib/Module/Build/Platform/aix.pm b/lib/Module/Build/Platform/aix.pm
index e8928acd..983b25d0 100644
--- a/lib/Module/Build/Platform/aix.pm
+++ b/lib/Module/Build/Platform/aix.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::aix;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/cygwin.pm b/lib/Module/Build/Platform/cygwin.pm
index 136e853e..29233b28 100644
--- a/lib/Module/Build/Platform/cygwin.pm
+++ b/lib/Module/Build/Platform/cygwin.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::cygwin;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/darwin.pm b/lib/Module/Build/Platform/darwin.pm
index 2f939a15..ef381c48 100644
--- a/lib/Module/Build/Platform/darwin.pm
+++ b/lib/Module/Build/Platform/darwin.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::darwin;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/Platform/os2.pm b/lib/Module/Build/Platform/os2.pm
index 40797fb8..5c514fcf 100644
--- a/lib/Module/Build/Platform/os2.pm
+++ b/lib/Module/Build/Platform/os2.pm
@@ -1,9 +1,6 @@
 package Module::Build::Platform::os2;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
 use vars qw(@ISA);
diff --git a/lib/Module/Build/PodParser.pm b/lib/Module/Build/PodParser.pm
index 81024c07..ccd7e005 100644
--- a/lib/Module/Build/PodParser.pm
+++ b/lib/Module/Build/PodParser.pm
@@ -1,9 +1,6 @@
 package Module::Build::PodParser;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
 use vars qw(@ISA);
 
 sub new {
diff --git a/lib/Module/Build/YAML.pm b/lib/Module/Build/YAML.pm
index 133dee54..74117fb3 100644
--- a/lib/Module/Build/YAML.pm
+++ b/lib/Module/Build/YAML.pm
@@ -2,7 +2,6 @@ package Module::Build::YAML;
 use strict;
 use CPAN::Meta::YAML 0.002 ();
 our @ISA = qw(CPAN::Meta::YAML);
-our $VERSION  = '1.41';
 1;
 
 =head1 NAME
diff --git a/lib/inc/latest.pm b/lib/inc/latest.pm
index bd276273..107e581b 100644
--- a/lib/inc/latest.pm
+++ b/lib/inc/latest.pm
@@ -3,10 +3,6 @@ package inc::latest;
 use if $] >= 5.019, 'deprecate';
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
-
 use Carp;
 use File::Basename  ();
 use File::Spec      ();
diff --git a/lib/inc/latest/private.pm b/lib/inc/latest/private.pm
index 53c48622..e9acd998 100644
--- a/lib/inc/latest/private.pm
+++ b/lib/inc/latest/private.pm
@@ -3,10 +3,6 @@ package inc::latest::private;
 use if $] >= 5.019, 'deprecate';
 
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.4005';
-$VERSION = eval $VERSION;
-
 use File::Spec;
 
 # must ultimately "goto" the import routine of the module to be loaded