diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..728a4c02
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,52 @@
+Andrew Page <andrew@infosiftr.com>
+Andrey Khozov <avkhozov@gmail.com>
+Ashley Willis <ashleyw@cpan.org>
+Ask Bjørn Hansen <ask@develooper.com>
+Brendan W. McAdams <brendan@mongodb.com> <brendan@10gen.com>
+Casey Rojas <casey.j.rojas@gmail.com> <crojas@infotechfl.com>
+Christian Sturm <kind@gmx.at>
+Colin Cyr <ccyr@sailingyyc.com>
+D. Ilmari Mannsåker <ilmari.mannsaker@net-a-porter.com>
+David Golden <david@mongodb.com> <dagolden@cpan.org>
+David Morrison <dmorrison@venda.com>
+David Nadle <david@nadle.com>
+David Steinbrunner <dsteinbrunner@pobox.com>
+David Storch <david.storch@mongodb.com> <david.storch@10gen.com>
+Eric Daniels <eric.daniels@mongodb.com> <eric@erdaniels.com>
+Florian Ragwitz <rafl@debian.org>
+Gerard Goossen <gerard@ggoossen.net>
+Graham Barr <gbarr@pobox.com>
+J. Stewart <jstewart@langley.theshire>
+Jason Carey <jason.carey@mongodb.com> <jcarey@cheetahmail.com>
+Jason Toffaletti <jason@topsy.com> <toffaletti@gmail.com>
+Johann Rolschewski <rolschewski@gmail.com>
+Joseph Harnish <bigjoe1008@gmail.com>
+Joshua Juran <jjuran@metamage.com>
+Kamil Slowikowski <kslowikowski@gmail.com>
+Ken Williams <kwilliams@cpan.org> <Ken.Williams@WindLogics.com>
+Kristina Chodorow <kristina@mongodb.com> <kristina@10gen.com>
+Kristina Chodorow <kristina@mongodb.com> <k@ubuntu.(none)>
+Kristina Chodorow <kristina@mongodb.com> <k@wooster.(none)>
+Kristina Chodorow <kristina@mongodb.com> <kristina@Macintosh.local>
+Matthew Shopsin <matt.shopsin@mongodb.com> <matt.shopsin@10gen.com>
+Michael Langner <langner@fch.de>
+Michael Rotmanov <rotmanov@sipgate.de>
+Mike Dirolf <mike@mongodb.com> <mike@10gen.com>
+Mike Friedman <mike.friedman@mongodb.com> <mike.friedman@10gen.com>
+Mike Friedman <mike.friedman@mongodb.com> <friedo@friedo.com>
+Mike Friedman <mike.friedman@mongodb.com> <vagrant@client.mongotest.com>
+Nuno Carvalho <mestre.smash@gmail.com>
+Orlando Vazquez <ovazquez@gmail.com>
+Othello Maurer <omaurer@venda.com>
+Robin Lee <cheeselee@fedoraproject.org>
+Roman Yerin <kid@cpan.org>
+Ronald J Kimball <rkimball@pangeamedia.com>
+Stephen Oberholtzer <stevie@qrpff.net>
+Steve Sanbeg <stevesanbeg@buzzfeed.com>
+Stuart Watt <stuart@morungos.com>
+Uwe Voelker <uwe.voelker@xing.com>
+Whitney.Jackson <whjackson@gmail.com>
+danny <danny@paperskymedia.com>
+mapbuh <n.trupcheff@gmail.com>
+nightlord <zzh_621@yahoo.com>
+nightsailer <nightsailer@gmail.com>
diff --git a/dist.ini b/dist.ini
index b3339536..dea1492e 100644
--- a/dist.ini
+++ b/dist.ini
@@ -1,7 +1,7 @@
 name       = MongoDB
-author     = David Golden <david.golden@mongodb.org>
+author     = David Golden <david@mongodb.com>
 author     = Mike Friedman <friedo@mongodb.com>
-author     = Kristina Chodorow <kristina@mongodb.org>
+author     = Kristina Chodorow <kristina@mongodb.com>
 author     = Florian Ragwitz <rafl@debian.org>
 license    = Apache_2_0
 copyright_holder = MongoDB, Inc.
@@ -151,6 +151,7 @@ default_jobs = 9
 ; generate META.yml and META.json files
 [MetaYAML]
 [MetaJSON]
+[Git::Contributors]
 
 ; *** AfterBuild phase ***
 ; none
diff --git a/weaver.ini b/weaver.ini
index 1554e682..4af69bc3 100644
--- a/weaver.ini
+++ b/weaver.ini
@@ -1,8 +1,5 @@
 [-SingleEncoding]
 
-[-Transformer / Lists]
-transformer = List
-
 [@CorePrep]
 
 [Name]
@@ -13,6 +10,7 @@ transformer = List
 
 [Generic / SYNOPSIS]
 [Generic / DESCRIPTION]
+[Generic / USAGE]
 
 [Collect / ATTRIBUTES]
 command = attr
@@ -24,5 +22,18 @@ command = method
 
 [Region / postlude]
 
+[Support]
+perldoc  = 0
+websites = none
+bugs = metadata
+bugs_content = Please report any bugs or feature requests through the issue tracker at L<https://jira.mongodb.org/browse/PERL>.  You will be notified automatically of any progress on your issue.
+repository_link = both
+repository_content = This is open source software.  The code repository is available for public review and contribution under the terms of the license.
+
 [Authors]
+[Contributors]
 [Legal]
+
+[-Transformer / Lists]
+transformer = List
+