diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..ff667ff
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Yanick Champoux <yanick@cpan.org> <yanick@babyl.dyndns.org>
diff --git a/Changes b/Changes
index 08c120b..cc0ec4f 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,6 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
-
-0.15.0    2013-02-02
  [API CHANGES]
 
  [BUG FIXES]
@@ -10,12 +8,19 @@ Revision history for {{$dist->name}}
  [DOCUMENTATION]
 
  [ENHANCEMENTS]
- - Use DZ::P::Twitter version 0.019 (now with twitter cards!)
+ - Add DZP::ContributorsFromGit and DZP::ContributorsFile
 
  [NEW FEATURES]
 
  [STATISTICS]
 
+0.15.0 2013-02-02
+ [ENHANCEMENTS]
+ - Use DZ::P::Twitter version 0.019 (now with twitter cards!)
+
+ [STATISTICS]
+ - code churn: 2 files changed, 14 insertions(+), 3 deletions(-)
+
 0.14.0 2012-12-12
  [ENHANCEMENTS]
  - use ReportVersions::Tiny
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 1ea277b..f371448 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -4,3 +4,4 @@ Dist-Zilla-PluginBundle-YANICK.*
 ^\.gitignore
 ^\.git
 ^\.build
+.mailmap
diff --git a/dist.ini b/dist.ini
index c371791..f9a81b9 100644
--- a/dist.ini
+++ b/dist.ini
@@ -1,13 +1,11 @@
 name    = Dist-Zilla-PluginBundle-YANICK
-author  = Yanick Champoux <yanick@babyl.dyndns.org>
+author  = Yanick Champoux <yanick@cpan.org>
 license = Perl_5
 copyright_holder = Yanick Champoux
 copyright_year   = 2010
 
 [Bootstrap::lib]
 
-[ShareDir]
-
 [Prereqs]
 Dist::Zilla::Plugin::ReadmeMarkdownFromPod = 0
 
diff --git a/lib/Dist/Zilla/PluginBundle/YANICK.pm b/lib/Dist/Zilla/PluginBundle/YANICK.pm
index 4d59b41..6a0932b 100644
--- a/lib/Dist/Zilla/PluginBundle/YANICK.pm
+++ b/lib/Dist/Zilla/PluginBundle/YANICK.pm
@@ -7,6 +7,9 @@ package Dist::Zilla::PluginBundle::YANICK;
 This is the plugin bundle that Yanick uses to release
 his distributions. It's roughly equivalent to
 
+    [ContributorsFromGit]
+    [ContributorsFile]
+
     [Test::Compile]
 
     [CoalescePod]
@@ -122,6 +125,8 @@ use strict;
 
 use Moose;
 
+use Dist::Zilla::Plugin::ContributorsFile;
+use Dist::Zilla::Plugin::ContributorsFromGit;
 use Dist::Zilla::Plugin::ModuleBuild;
 use Dist::Zilla::Plugin::GithubMeta;
 use Dist::Zilla::Plugin::Homepage;
@@ -164,6 +169,8 @@ sub configure {
 
     $self->add_plugins(
         qw/ 
+            ContributorsFromGit
+            ContributorsFile
             Test::Compile
             CoalescePod
             InstallGuide