diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..c408b83
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Darragh Bailey <daragh.bailey@gmail.com> <dbailey@hpe.com>
+Darragh Bailey <daragh.bailey@gmail.com> <dbailey@hp.com>
diff --git a/AUTHORS b/AUTHORS
index a6b77e2..1e0346f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,14 @@
-Darragh Bailey <dbailey@hp.com>
+Darragh Bailey <daragh.bailey@gmail.com>
+Davide Guerri <davide.guerri@hp.com>
+Eric Peterson <ejpetey@gmail.com>
+Jenkins <jenkins@jenkins.hpcloud.net>
+Jeremy Stanley <fungi@yuggoth.org>
+Jon-Paul Sullivan <jonpaul.sullivan@hp.com>
+Jonathan Brownell <brownell@hp.com>
+Jonathan Harker <code@gentlydownthe.net>
+Manuel Desbonnet <manuel.desbonnet@hp.com>
+Monty Taylor <mordred@inaugust.com>
+Paul Bourke <paul.bourke@oracle.com>
+Spencer Krum <nibz@spencerkrum.com>
+Tom Cammann <tom.cammann@hp.com>
+venkatamahesh <venkatamaheshkotha@gmail.com>
diff --git a/setup.cfg b/setup.cfg
index 4046873..4a443e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,9 @@ classifiers =
 [global]
 commands = build_manpage.BuildManpage
 
+[pbr]
+skip_changelog = True
+
 [files]
 packages =
     git_upstream