diff --git a/.mailmap b/.mailmap
index 972c6d0e3b..c1929e9a29 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,8 +1,19 @@
-# This file exists to help map usernames to proper names and email addresses
-# in the Open MPI github mirror of the canonical SVN repository.  The github
-# mirror can be found here:
+# This file exists to help consolidate names and email addresses
+# (e.g., when people accidentally commit with an incorrect or local
+# email address).  Two common use cases:
 #
-#   https://github.com/open-mpi/ompi-svn-mirror
+# 1. Consolidate multiple email addresses from a single person.
+#    Example: one commit from John Smith is from
+#    <john.smith@his.work.com> and another is from
+#    <jsmith@workstation.his.work.com>, and a third is from
+#    <rocketman9982@users.noreply.github.com>.  But they're all from
+#    the same John Smith person.
+#
+# 2. Consolidate misspellings / altername names from a single person.
+#    Example: one commit is from "John Smith" and another is from
+#    "John Smith, CONTRACTOR", and third is from "RocketMan 9982".  But
+#    these are all really the same person, who can be listed once in
+#    AUTHORS as "John Smith".
 #
 # The format of this file is documented in git-shortlog(1).  Specifically,
 # a line like this:
@@ -12,123 +23,79 @@
 # means that when git sees "commit@email.xx" it will display
 # "Proper Name <proper@email.xx>" instead in certain circumstances.  Those
 # circumstances include:
+#
 #   - git shortlog
 #   - git blame
 #   - git log --format=tformat:"%aN <%aE>"   (and similar)
 #
-# A copy of this file should be present on each branch in SVN which is being
-# tracked in the Git mirror.
 
-Dave Goodell <dgoodell@cisco.com> <dgoodell@open-mpi-git-mirror.example.com>
-Jeff Squyres <jsquyres@cisco.com> <jsquyres@open-mpi-git-mirror.example.com>
-# Jeff accidentally stomped on his $HOME/.gitconfig for a short while:
+Jeff Squyres <jsquyres@cisco.com> <jsquyres@users.noreply.github.com>
 Jeff Squyres <jsquyres@cisco.com> --quiet <--quiet>
-Reese Faucette <rfaucett@cisco.com> <rfaucett@open-mpi-git-mirror.example.com>
-Bill D'Amico <bdamico@cisco.com> <damico@open-mpi-git-mirror.example.com>
-Adrian Reber <adrian.reber@hs-esslingen.de> <adrian@open-mpi-git-mirror.example.com>
+Jeff Squyres <no-author@open-mpi.org>
 
-# fix Manjunath's name, it was inadvertently truncated in commit c4e17f1
-Manjunath Gorentla Venkata <manjugv@open-mpi-git-mirror.example.com>
+George Bosilca <bosilca@icl.utk.edu> <bosilca@users.noreply.github.com>
 
-George Bosilca <bosilca@icl.utk.edu> <bosilca@open-mpi-git-mirror.example.com>
-Aurelien Bouteiller <bouteill@icl.utk.edu> <bouteill@open-mpi-git-mirror.example.com>
-Thomas Herault <herault@icl.utk.edu> <herault@open-mpi-git-mirror.example.com>
+Howard Pritchard <howardp@lanl.gov> <hppritcha@users.noreply.github.com>
+Howard Pritchard <howardp@lanl.gov> <howardp@lanl.gov>
 
-# If you want your name to be rendered properly in these situations, please
-# remove it from the list below, place it above, uncomment it, and change
-# "proper.name@proper.domain" to the appropriate values.  This template list
-# comes from the AUTHORS file.
-#
-#Abhishek Kulkarni <proper.name@proper.domain> <abbyz@open-mpi-git-mirror.example.com>
-#Adrian Knoth <proper.name@proper.domain> <adi@open-mpi-git-mirror.example.com>
-#Abhishek Kulkarni <proper.name@proper.domain> <adkulkar@open-mpi-git-mirror.example.com>
-#Andrew Friedley <proper.name@proper.domain> <afriedle@open-mpi-git-mirror.example.com>
-#Aleksey Senin <proper.name@proper.domain> <alekseys@open-mpi-git-mirror.example.com>
-#Alex Margolin <proper.name@proper.domain> <alex@open-mpi-git-mirror.example.com>
-#Alex Mikheev <proper.name@proper.domain> <amikheev@open-mpi-git-mirror.example.com>
-#Thara Angskun <proper.name@proper.domain> <angskun@open-mpi-git-mirror.example.com>
-#Anya Tatashina <proper.name@proper.domain> <Anya@open-mpi-git-mirror.example.com>
-#Avneesh Pant <proper.name@proper.domain> <apant@open-mpi-git-mirror.example.com>
-#Brad Benton <proper.name@proper.domain> <bbenton@open-mpi-git-mirror.example.com>
-#Brian Barrett <proper.name@proper.domain> <brbarret@open-mpi-git-mirror.example.com>
-#Alex Brick <proper.name@proper.domain> <bricka@open-mpi-git-mirror.example.com>
-#Laura Casswell <proper.name@proper.domain> <casswell@open-mpi-git-mirror.example.com>
-#Camille Coti <proper.name@proper.domain> <coti@open-mpi-git-mirror.example.com>
-#Christian Bell <proper.name@proper.domain> <csbell@open-mpi-git-mirror.example.com>
-#Chris Yeoh <proper.name@proper.domain> <cyeoh@open-mpi-git-mirror.example.com>
-#David Daniel <proper.name@proper.domain> <ddd@open-mpi-git-mirror.example.com>
-#Nadia Derby <proper.name@proper.domain> <derbeyn@open-mpi-git-mirror.example.com>
-#Denis Dimick <proper.name@proper.domain> <dgdimick@open-mpi-git-mirror.example.com>
-#Donald Kerr <proper.name@proper.domain> <dkerr@open-mpi-git-mirror.example.com>
-#Dan Lacher <proper.name@proper.domain> <dlacher@open-mpi-git-mirror.example.com>
-#Doron Shoham <proper.name@proper.domain> <dorons@open-mpi-git-mirror.example.com>
-#Edgar Gabriel <proper.name@proper.domain> <edgar@open-mpi-git-mirror.example.com>
-#Ethan Mallove <proper.name@proper.domain> <emallove@open-mpi-git-mirror.example.com>
-#Eugene Loh <proper.name@proper.domain> <eugene@open-mpi-git-mirror.example.com>
-#Graham Fagg <proper.name@proper.domain> <gef@open-mpi-git-mirror.example.com>
-#Ginger Young <proper.name@proper.domain> <gingery@open-mpi-git-mirror.example.com>
-#Gleb Natapov <proper.name@proper.domain> <gleb@open-mpi-git-mirror.example.com>
-#Galen Shipman <proper.name@proper.domain> <gshipman@open-mpi-git-mirror.example.com>
-#Greg Watson <proper.name@proper.domain> <gwatson@open-mpi-git-mirror.example.com>
-#Nathan Hjelm <proper.name@proper.domain> <hjelmn@open-mpi-git-mirror.example.com>
-#Sven Stork <proper.name@proper.domain> <hpcstork@open-mpi-git-mirror.example.com>
-#Torsten Hoefler <proper.name@proper.domain> <htor@open-mpi-git-mirror.example.com>
-#Iain Bason <proper.name@proper.domain> <igb@open-mpi-git-mirror.example.com>
-#Igor Usarov <proper.name@proper.domain> <igoru@open-mpi-git-mirror.example.com>
-#Jon Mason <proper.name@proper.domain> <jdmason@open-mpi-git-mirror.example.com>
-#Josh Hursey <proper.name@proper.domain> <jjhursey@open-mpi-git-mirror.example.com>
-#Joshua Ladd <proper.name@proper.domain> <jladd@open-mpi-git-mirror.example.com>
-#Nysal Jan <proper.name@proper.domain> <jnysal@open-mpi-git-mirror.example.com>
-#Jose E. Roman <proper.name@proper.domain> <jroman@open-mpi-git-mirror.example.com>
-#Matthias Jurenz <proper.name@proper.domain> <jurenz@open-mpi-git-mirror.example.com>
-#Karen Norteman <proper.name@proper.domain> <karenn@open-mpi-git-mirror.example.com>
-#Yevgeny Kliteynik <proper.name@proper.domain> <kliteyn@open-mpi-git-mirror.example.com>
-#Karl Mroz <proper.name@proper.domain> <kmroz@open-mpi-git-mirror.example.com>
-#Andreas Knuepfer <proper.name@proper.domain> <knuepfer@open-mpi-git-mirror.example.com>
-#Greg Koenig <proper.name@proper.domain> <koenig@open-mpi-git-mirror.example.com>
-#Pierre Lemarinier <proper.name@proper.domain> <lemarini@open-mpi-git-mirror.example.com>
-#Lenny Verkhovsky <proper.name@proper.domain> <lennyve@open-mpi-git-mirror.example.com>
-#Andrew Lumsdaine <proper.name@proper.domain> <lums@open-mpi-git-mirror.example.com>
-#Manjunath Gorentla Venkata <proper.name@proper.domain> <manjugv@open-mpi-git-mirror.example.com>
-#Ken Matney <proper.name@proper.domain> <matney@open-mpi-git-mirror.example.com>
-#Mike Dubman <proper.name@proper.domain> <miked@open-mpi-git-mirror.example.com>
-#Mitch Sukalski <proper.name@proper.domain> <mitch@open-mpi-git-mirror.example.com>
-#Mohamad Chaarawi <proper.name@proper.domain> <mschaara@open-mpi-git-mirror.example.com>
-#Mark Taylor <proper.name@proper.domain> <mt@open-mpi-git-mirror.example.com>
-#Tom Naughton <proper.name@proper.domain> <naughtont@open-mpi-git-mirror.example.com>
-#Li-Ta Lo <proper.name@proper.domain> <ollie@open-mpi-git-mirror.example.com>
-#Oscar Vega-Gisbert <proper.name@proper.domain> <osvegis@open-mpi-git-mirror.example.com>
-#Pak Lui <proper.name@proper.domain> <paklui@open-mpi-git-mirror.example.com>
-#Pavel Shamis <proper.name@proper.domain> <pasha@open-mpi-git-mirror.example.com>
-#Patrick Geoffray <proper.name@proper.domain> <patrick@open-mpi-git-mirror.example.com>
-#Brad Penoff <proper.name@proper.domain> <penoff@open-mpi-git-mirror.example.com>
-#Jelena Pjesivac-Grbovic <proper.name@proper.domain> <pjesa@open-mpi-git-mirror.example.com>
-#Prabhanjan Kambadur <proper.name@proper.domain> <pkambadu@open-mpi-git-mirror.example.com>
-#Craig Rasmussen <proper.name@proper.domain> <rasmussn@open-mpi-git-mirror.example.com>
-#Ron Brightwell <proper.name@proper.domain> <rbbrigh@open-mpi-git-mirror.example.com>
-#Ralph Castain <proper.name@proper.domain> <rhc@open-mpi-git-mirror.example.com>
-#Rich Graham <proper.name@proper.domain> <rlgraham@open-mpi-git-mirror.example.com>
-#Rolf Vandevaart <proper.name@proper.domain> <rolfv@open-mpi-git-mirror.example.com>
-#Rob Awles <proper.name@proper.domain> <rta@open-mpi-git-mirror.example.com>
-#Rainer Keller <proper.name@proper.domain> <rusraink@open-mpi-git-mirror.example.com>
-#Sami Ayyorgun <proper.name@proper.domain> <sami@open-mpi-git-mirror.example.com>
-#Samuel K. Gutierrez <proper.name@proper.domain> <samuel@open-mpi-git-mirror.example.com>
-#Gopal Santhanaraman <proper.name@proper.domain> <santhana@open-mpi-git-mirror.example.com>
-#Swen Boehm <proper.name@proper.domain> <sboehm@open-mpi-git-mirror.example.com>
-#Sharon Melamed <proper.name@proper.domain> <sharonm@open-mpi-git-mirror.example.com>
-#Shiqing Fan <proper.name@proper.domain> <shiqing@open-mpi-git-mirror.example.com>
-#Sylvain Jeaugey <proper.name@proper.domain> <sjeaugey@open-mpi-git-mirror.example.com>
-#Sayantan Sur <proper.name@proper.domain> <surs@open-mpi-git-mirror.example.com>
-#Sushant Sharma <proper.name@proper.domain> <sushant@open-mpi-git-mirror.example.com>
-#Steve Wise <proper.name@proper.domain> <swise@open-mpi-git-mirror.example.com>
-#Terry Dontje <proper.name@proper.domain> <tdd@open-mpi-git-mirror.example.com>
-#Tim Mattox <proper.name@proper.domain> <timattox@open-mpi-git-mirror.example.com>
-#Tim Prins <proper.name@proper.domain> <tprins@open-mpi-git-mirror.example.com>
-#Tim Woodall <proper.name@proper.domain> <twoodall@open-mpi-git-mirror.example.com>
-#Vasily Filipov <proper.name@proper.domain> <vasily@open-mpi-git-mirror.example.com>
-#Vishal Sahay <proper.name@proper.domain> <vsahay@open-mpi-git-mirror.example.com>
-#Vishwanath Venkatesan <proper.name@proper.domain> <vvenkatesan@open-mpi-git-mirror.example.com>
-#Wesley Bland <proper.name@proper.domain> <wbland@open-mpi-git-mirror.example.com>
-#Yael Dalen <proper.name@proper.domain> <yaeld@open-mpi-git-mirror.example.com>
-#Yossi Etigin <proper.name@proper.domain> <yosefe@open-mpi-git-mirror.example.com>
-#Weikuan Yu <proper.name@proper.domain> <yuw@open-mpi-git-mirror.example.com>
+Andrew Friedley <andrew.friedley@intel.com> <afriedle-intel@users.noreply.github.com>
+
+Devendar Bureddy <devendar@mellanox.com> <bureddy@users.noreply.github.com>
+
+Edgar Gabriel <egabriel@central.uh.edu> <edgargabriel@users.noreply.github.com>
+Edgar Gabriel <gabriel@cs.uh.edu> <gabriel@Peggys-MacBook-Air.local>
+
+Gilles Gouaillardet <gilles@rist.or.jp> <ggouaillardet@users.noreply.github.com>
+
+Matias A Cabral <matias.a.cabral@intel.com> <matcabral@users.noreply.github.com>
+Matias A Cabral <matias.a.cabral@intel.com> <matias.a.cabral@intel.com>
+
+Pavel Shamis <shamisp@ornl.gov> <shamisp@ornl.gov>
+Pavel Shamis <shamisp@ornl.gov> <shamisp@users.noreply.github.com>
+Pavel Shamis <pasharesearch@gmail.com> <pasharesearch@gmail.com>
+
+Todd Kordenbrock <thkgcode@gmail.com> <tkordenbrock@users.noreply.github.com>
+
+Yohann Burette <yohann.burette@intel.com> <yburette@users.noreply.github.com>
+Yohann Burette <yohann.burette@intel.com> <yohann.burette@intel.com>
+
+MPI Team (bot) <mpiteam@open-mpi.org> <mpiteam@open-mpi.org>
+
+Yossi Itigin <yosefe@mellanox.com> <yosefe@mellanox.com>
+
+Josh Hursey <jjhursey@open-mpi.org> <jjhursey@open-mpi.org>
+Josh Hursey <jhursey@us.ibm.com> <jhursey@us.ibm.com>
+
+Adrian Reber <adrian@lisas.de> <adrian@lisas.de>
+
+Elena Elkina <elena.elkina@itseez.com> <elena.elkina@itseez.com>
+Elena Elkina <elena.elkina@itseez.com> <elena.elkina89@gmail.com>
+
+Igor Ivanov <igor.ivanov.va@gmail.com> <igor.ivanov.va@gmail.com>
+Igor Ivanov <Igor.Ivanov@itseez.com> <Igor.Ivanov@itseez.com>
+
+Mangala Jyothi Bhaskar <mjbhaskar@uh.edu> <mjbhaskar@uh.edu>
+Mangala Jyothi Bhaskar <mjbhaskar@uh.edu> <mjbhaskar@crill.cs.uh.edu>
+
+Ralph Castain <rhc@open-mpi.org> <rhc@open-mpi.org>
+Ralph Castain <rhc@open-mpi.org> <rhc@odin.cs.indiana.edu>
+
+Rolf vandeVaart <rvandevaart@nvidia.com> <rvandevaart@nvidia.com>
+
+Karol Mroz <mroz.karol@gmail.com> <mroz.karol@gmail.com>
+
+Nadezhda Kogteva <nadezhda.kogteva@itseez.com> <nadezhda@mngx-orion-01.dmz.e2e.mlnx>
+
+Thananon Patinyasakdikul <apatinya@cisco.com> <apatinya@savbu-usnic-a.cisco.com>
+
+Nysal Jan K A <jnysal@in.ibm.com> <jnysal@in.ibm.com>
+Nysal Jan K A <jnysal@in.ibm.com> <jnysal@gmail.com>
+
+Zhi Ming Wang <wangzm@cn.ibm.com> <wangzm@cn.ibm.com>
+
+Annapurna Dasari <annapurna.dasari@intel.com> <annapurna.dasari@intel.com>
+
+L. R. Rajeshnarayanan <l.r.rajeshnarayanan@intel.com> <l.r.rajeshnarayanan@intel.com>
+
+Aurélien Bouteiller <bouteill@icl.utk.edu> <bouteill@icl.utk.edu>
+Aurélien Bouteiller <bouteill@icl.utk.edu> <darter4.nics.utk.edu>
diff --git a/AUTHORS b/AUTHORS
index 6fea019ba3..80c6e70c51 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,155 +1,315 @@
 Open MPI Authors
 ================
 
-The following cumulative list contains the names and email addresses of
-all individuals who have committed code to the Open MPI repository.
+The following cumulative list contains the names and email addresses
+of all individuals who have committed code to the Open MPI repository
+(either directly or through a third party, such as through a
+Github.com pull request).  Note that these email addresses are not
+guaranteed to be current; they are simply a unique indicator of the
+individual who committed them.
 
-Email                           Name                        Affiliation(s)
-------------------------------- --------------------------- -------------------
-Nadia.Derbey@bull.net           Nadia Derby                 Bull
-adi@minet.uni-jena.de           Adrian Knoth                UJ
-adkulkar@cs.indiana.edu         Abhishek Kulkarni           IU
-adrian@lisas.de                 Adrian Reber                HE
-afriedle@osl.iu.edu             Andrew Friedley             IU, SNL
-alekseys@mellanox.com           Aleksey Senin               Mellanox
-alex.margolin@mail.huji.ac.il   Alex Margolin               Mellanox
-alexm@mellanox.com              Alex Mikheev                Mellanox
-alinas@mellanox.com             Alina Sklarevich            Mellanox
-andreas.knuepfer@tu-dresden.de  Andreas Knuepfer            ZIH
-angskun@cs.utk.edu              Thara Angskun               UTK
-anya.tatashina@sun.com          Anya Tatashina              Sun
-artpol84@gmail.com              Artem Polyakov              Individual
-avneesh.pant@qlogic.com         Avneesh Pant                QLogic
-bdamico@cisco.com               Bill D'Amico                Cisco
-bert.wesarg@tu-dresden.de       Bert Wesarg                 ZIH
-bosilca@icl.utk.edu             George Bosilca              UTK
-bouteill@icl.utk.edu            Aurelien Bouteiller         UTK
-brad.benton@us.ibm.com          Brad Benton                 IBM, AMD
-brbarret@open-mpi.org           Brian Barrett               IU, LANL, SNL
-ccoti@icl.utk.edu               Camille Coti                UTK, INRIA
-christian.bell@qlogic.com       Christian Bell              QLogic
-cyeoh@au1.ibm.com               Chris Yeoh                  IBM
-dan.lacher@sun.com              Dan Lacher                  Sun
-ddd@lanl.gov                    David Daniel                LANL
-devendar@mellanox.com           Devendar Bureddy            Mellanox
-dgdimick@lnal.gov               Denis Dimick                LANL
-dgoodell@cisco.com              Dave Goodell                Cisco
-donald.kerr@oracle.com          Donald Kerr                 Sun, Oracle
-dorons@mellanox.com             Doron Shoham                Mellanox
-ethan.mallove@oracle.com        Ethan Mallove               Sun, Oracle
-eugene.loh@oracle.com           Eugene Loh                  Sun, Oracle
-gabriel@cs.uh.edu               Edgar Gabriel               HLRS, UH, UTK
-gef@icl.utk.edu                 Graham Fagg                 UTK
-gilles@rist.or.jp               Gilles Gouaillardet         RIST
-gingery@lanl.gov                Ginger Young                LANL
-gleb@voltaire.com               Gleb Natapov                Voltaire
-gpaulsen@us.ibm.com             Geoffrey Paulsen            IBM
-gshipman@lanl.gov               Galen Shipman               LANL
-gwatson@lanl.gov                Greg Watson                 LANL
-herault@icl.utk.edu             Thomas Herault              INRIA
-hjelmn@lanl.gov                 Nathan Hjelm                LANL
-hmontakhabi@uh.edu              Hadi Montakhabi             UH
-howardp@lanl.gov                Howard Pritchard            LANL
-hppritcha@gmail.com             Howard Pritchard            LANL
-htor@osl.iu.edu                 Torsten Hoefler             IU, TUC
-iain.bason@oracle.com           Iain Bason                  Sun, Oracle
-igoru@mellanox.com              Igor Usarov                 Mellanox
-jdmason@opengridcomputing.com   Jon Mason                   Chelsio
-jjhursey@open-mpi.org           Josh Hursey                 IU, ORNL, LANL, LBNL, UWL
-jnysal@in.ibm.com               Nysal Jan                   IBM
-joshual@mellanox.com            Joshua Ladd                 Mellanox
-jroman@dsic.upv.es              Jose E. Roman               UPV
-jsquyres@cisco.com              Jeff Squyres                Cisco, IU
-karen.norteman@sun.com          Karen Norteman              Sun
-kliteyn@mellanox.co.il          Yevgeny Kliteynik           Mellanox
-koenig@acm.org                  Greg Koenig                 ORNL
-lcasswell@lanl.gov              Laura Casswell              LANL
-lemarini@icl.utk.edu            Pierre Lemarinier           UTK
-lennyb@voltaire.com             Lenny Verkhovsky            Mellanox
-lums@cs.indiana.edu             Andrew Lumsdaine            IU
-manjugv@ornl.gov                Manjunath Gorentla Venkata  ORNL
-matneykdsr@ornl.gov             Ken Matney                  ORNL
-matthias.jurenz@tu-dresden.de   Matthias Jurenz             ZIH
-miked@mellanox.com              Mike Dubman                 Mellanox
-mjbhaskar@uh.edu                Mangala Jyothi Bhaskar      UH
-mroz.karol@gmail.com            Karol Mroz                  UBC
-mschaara@cs.uh.edu              Mohamad Chaarawi            UH
-mt@lanl.gov                     Mark Taylor                 LANL
-mwsukal@ca.sandia.gov           Mitch Sukalski              SNL
-naughtont@ornl.gov              Tom Naughton                ORNL
-niethammer@hlrs.de              Christoph Niethammer        HLRS
-ollie@lanl.gov                  Li-Ta Lo                    LANL
-ovega@dsic.upv.es               Oscar Vega-Gisbert          UPV
-pak.lui@sun.com                 Pak Lui                     Sun
-patrick@myri.com                Patrick Geoffray            Myricom
-penoff@cs.ubc.ca                Brad Penoff                 UBC
-pjesa@icl.iu.edu                Jelena Pjesivac-Grbovic     UTK
-pkambadu@osl.iu.edu             Prabhanjan Kambadur         IU
-rainer.keller@hlrs.de           Rainer Keller               HLRS, ORNL
-rasmus@cas.uoregon.edu          Craig Rasmussen             LANL, UO
-rbbrigh@sandia.gov              Ron Brightwell              SNL
-regrant@sandia.gov              Ryan Grant                  SNL
-rfaucett@cisco.com              Reese Faucette              Cisco
-rhc@open-mpi.org                Ralph Castain               LANL, Cisco, Intel
-richardg@mellanox.com           Rich Graham                 ORNL, LANL, Mellanox
-rta@lanl.gov                    Rob Awles                   LANL
-rvandevaart@nvidia.com          Rolf Vandevaart             Sun, Oracle, NVIDIA
-sami@lanl.gov                   Sami Ayyorgun               LANL
-samuel@lanl.gov                 Samuel K. Gutierrez         LANL
-santhana@osu.edu                Gopal Santhanaraman         OSU
-sboehm@ornl.gov                 Swen Boehm                  ORNL
-shamisp@ornl.gov                Pavel Shamis                Mellanox, ORNL
-sharonm@voltaire.com            Sharon Melamed              Voltaire
-shiqing@hlrs.de                 Shiqing Fan                 HLRS
-stork@hlrs.de                   Sven Stork                  HLRS
-surs@osu.edu                    Sayantan Sur                OSU
-sushant@lanl.gov                Sushant Sharma              LANL
-swise@opengridcomputing.com     Steve Wise                  Chelsio
-sylvain.jeaugey@bull.net        Sylvain Jeaugey             Bull
-terry.dontje@oracle.com         Terry Dontje                Sun, Oracle
-thkorde@sandia.gov              Todd Kordenbrock            SNL
-tmattox@gmail.com               Tim Mattox                  IU, Cisco
-tpatinya@vols.utk.edu           Thananon Patinyasakdikul    UTK
-tprins@lanl.gov                 Tim Prins                   IU, LANL
-twoodall@lanl.gov               Tim Woodall                 LANL
-vasily@mellanox.com             Vasily Filipov              Mellanox
-vsahay@osl.iu.edu               Vishal Sahay                IU
-vvenkates@gmail.com             Vishwanath Venkatesan       UH, Intel
-wbland@icl.utk.edu              Wesley Bland                UTK
-yaeld@mellanox.com              Yael Dalen                  Mellanox
-yosefe@mellanox.com             Yossi Etigin                Mellanox
-yuw@lanl.gov                    Weikuan Yu                  LANL, OSU
-wangzm@cn.ibm.com               Zhiming Wang                IBM
-------------------------------- --------------------------- -------------------
+-----
 
-Affiliation abbreviations:
---------------------------
-
-AMD = Advanced Micro Devices, Inc.
-Chelsio = Chelsio Communications, Inc.
-Cisco = Cisco Systems, Inc.
-HE = Hochschule Esslingen
-HLRS = High Performance Computing Center, Stuttgart
-IU = Indiana University
-LANL = Los Alamos National Laboratory
-LBNL = Lawrence Berkeley National Laboratory
-Voltaire = Voltaire
-Myricom = Myricom, Inc.
-NU = Northeastern University
-Oracle = Oracle
-ORNL = Oak Ridge National Laboratory
-OSU = The Ohio State University
-QLogic = QLogic
-RIST = Research Organization for Information Science and Technology
-SNL = Sandia National Laboratories
-Sun = Sun Microsystems, Inc.
-TUC = Technische Universtaet Chemnitz
-UBC = University of British Columbia
-UJ = Friedrich-Schiller-Universitat Jena
-UH = University of Houston
-OU = University of Oregon
-UPV = Universitat Politecnica de Valencia
-UTK = University of Tennessee, Knoxville
-UWL = University of Wisconsin-La Crosse
-Mellanox = Mellanox
-ZIH = Technische Universitaet Dresden
+Abhishek Kulkarni, Indiana University
+  adkulkar@cs.indiana.edu
+Adrian Knoth, Friedrich-Schiller-Universitat Jena
+  adi@minet.uni-jena.de
+Adrian Reber, Hochschule Esslingen
+  adrian@lisas.de
+Aleksey Senin, Mellanox
+  alekseys@mellanox.com
+Alex Margolin, Mellanox
+  alex.margolin@mail.huji.ac.il
+Alex Mikheev, Mellanox
+  alexm@mellanox.com
+Alina Sklarevich, Mellanox
+  alinas@mellanox.com
+Andreas Knüpfer, Technische Universitaet Dresden
+  andreas.knuepfer@tu-dresden.de
+Andrew Friedley, Indiana University, Sandia National Laboratory, Intel
+  afriedle@osl.iu.edu
+  andrew.friedley@intel.com
+Andrew Lumsdaine, Indiana University
+  lums@cs.indiana.edu
+Annapurna Dasari, Intel
+  annapurna.dasari@intel.com
+Anya Tatashina, Sun
+  anya.tatashina@sun.com
+Artem Polyakov, Individual, Mellanox
+  artpol84@gmail.com
+Aurélien Bouteiller, University of Tennessee-Knoxville
+  bouteill@icl.utk.edu
+Avneesh Pant, QLogic
+  avneesh.pant@qlogic.com
+Bert Wesarg, Technische Universitaet Dresden
+  bert.wesarg@tu-dresden.de
+Bill D'Amico, Cisco
+  bdamico@cisco.com
+Boris Karasev, Mellanox
+  karasev.b@gmail.com
+Brad Benton, IBM, AMD
+  brad.benton@us.ibm.com
+Brad Penoff, University of British Columbia
+  penoff@cs.ubc.ca
+Brian Barrett, Indiana University, Los Alamos National Laboratory, Sandia National Laboratory
+  brbarret@open-mpi.org
+Brice Goglin, INRIA
+  brice.goglin@inria.fr
+Camille Coti, University of Tennessee-Knoxville, INRIA
+  ccoti@icl.utk.edu
+Christian Bell, QLogic
+  christian.bell@qlogic.com
+Christoph Niethammer, High Performance Computing Center, Stuttgart
+  niethammer@hlrs.de
+Christopher Yeoh, IBM
+  cyeoh@au1.ibm.com
+Craig E Rasmussen, Los Alamos National Laboratory, University of Oregon
+  rasmus@cas.uoregon.edu
+Dan Lacher, Sun
+  dan.lacher@sun.com
+Dave Goodell, Cisco
+  davidjgoodell@gmail.com
+  dgoodell@cisco.com
+David Daniel, Los Alamos National Laboratory
+  ddd@lanl.gov
+Denis Dimick, Los Alamos National Laboratory
+  dgdimick@lnal.gov
+Devendar Bureddy, Mellanox
+  devendar@mellanox.com
+Dimitar Pashov, Individual
+  d.pashov@gmail.com
+Donald Kerr, Sun, Oracle
+  donald.kerr@oracle.com
+Doron Shoham, Mellanox
+  dorons@mellanox.com
+Edgar Gabriel, High Performance Computing Center, Stuttgart, University of Tennessee-Knoxville, University of Houston
+  egabriel@central.uh.edu
+  gabriel@cs.uh.edu
+Elena Elkina, Mellanox
+  elena.elkina@itseez.com
+Ethan Mallove, Sun, Oracle
+  ethan.mallove@oracle.com
+Eugene Loh, Sun, Oracle
+  eugene.loh@oracle.com
+Francois WELLENREITER, Individual
+  francois.wellenreiter@atos.net
+  wellen@free.fr
+Galen Shipman, Los Alamos National Laboratory
+  gshipman@lanl.gov
+Geoffrey Paulsen, IBM
+  gpaulsen@us.ibm.com
+George Bosilca, University of Tennessee-Knoxville
+  bosilca@eecs.utk.edu
+  bosilca@icl.utk.edu
+Gilles Gouaillardet, Research Organization for Information Science and Technology
+  gilles.gouaillardet@iferc.org
+  gilles@rist.or.jp
+Ginger Young, Los Alamos National Laboratory
+  gingery@lanl.gov
+Gleb Natapov, Voltaire
+  gleb@voltaire.com
+Gopal Santhanaraman, The Ohio State University
+  santhana@osu.edu
+Graham Fagg, University of Tennessee-Knoxville
+  gef@icl.utk.edu
+Greg Koenig, Oak Ridge National Laboratory
+  koenig@acm.org
+Greg Watson, Los Alamos National Laboratory
+  gwatson@lanl.gov
+Hadi Montakhabi, University of Houston
+  hmontakhabi@uh.edu
+Howard Pritchard, Los Alamos National Laboratory
+  howardp@lanl.gov
+  hppritcha@gmail.com
+Iain Bason, Sun, Oracle
+  iain.bason@oracle.com
+Igor Ivanov, Mellanox
+  Igor.Ivanov@itseez.com
+  igor.ivanov.va@gmail.com
+Igor Usarov, Mellanox
+  igoru@mellanox.com
+Jeff Squyres, University of Indiana, Cisco
+  jeff@squyres.com
+  jsquyres@cisco.com
+Jelena Pjesivac-Grbovic, University of Tennessee-Knoxville
+  pjesa@icl.iu.edu
+Jithin Jose, Intel
+  jithin.jose@intel.com
+Jon Mason, OpenGrid Computing
+  jdmason@opengridcomputing.com
+Jose Roman, Universitat Politecnica de Valencia
+  jroman@dsic.upv.es
+Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM
+  jhursey@us.ibm.com
+  jjhursey@open-mpi.org
+Joshua Ladd, Mellanox
+  jladd.mlnx@gmail.com
+  joshual@mellanox.com
+KAWASHIMA Takahiro, Fujistu
+  rivis.kawashima@nifty.com
+  t-kawashima@jp.fujitsu.com
+Karen Norteman, Sun
+  karen.norteman@sun.com
+Karol Mroz, University of British Columbia
+  mroz.karol@gmail.com
+Kenneth Matney, Oak Ridge National Laboratory
+  matneykdsr@ornl.gov
+L. R. Rajeshnarayanan, Intel
+  l.r.rajeshnarayanan@intel.com
+LANL OMPI Bot, Los Alamos National Laboratory
+  ompigithub@lanl.gov
+Laura Casswell, Los Alamos National Laboratory
+  lcasswell@lanl.gov
+Lenny Verkhovsky, Voltaire
+  lennyb@voltaire.com
+Li-Ta Lo, Los Alamos National Laboratory
+  ollie@lanl.gov
+MPI Team (bot), self
+  mpiteam@open-mpi.org
+Mangala Jyothi Bhaskar, University of Houston
+  mjbhaskar@salmon.cs.uh.edu
+  mjbhaskar@uh.edu
+Manjunath Gorentla Venkata, Oak Ridge National Laboratory
+  manjugv@ornl.gov
+Mark Santcroos, Rutgers University
+  mas781@scarletmail.rutgers.edu
+Mark Taylor, Los Alamos National Laboratory
+  mt@lanl.gov
+Matias A Cabral, Intel
+  matias.a.cabral@intel.com
+Matthias Jurenz, Technische Universitaet Dresden
+  matthias.jurenz@tu-dresden.de
+Maximilien Levesque, Individual
+  maximilien.levesque@gmail.com
+Mike Dubman, Mellanox
+  miked@mellanox.com
+Mitch Sukalski, Sandia National Laboratory
+  mwsukal@ca.sandia.gov
+Mohamad Chaarawi, University of Houston
+  mschaara@cs.uh.edu
+Nadezhda Kogteva, Mellanox
+  nadezhda.kogteva@itseez.com
+Nadia Derbey, Bull
+  nadia.derbey@bull.net
+Nathan Hjelm, Los Alamos National Laboratory
+  hjelmn@cs.unm.edu
+  hjelmn@lanl.gov
+  hjelmn@me.com
+Nathaniel Graham, Los Alamos National Laboratory
+  ngraham@lanl.gov
+  nrgraham23@gmail.com
+Nick Papior Andersen, Individual
+  nickpapior@gmail.com
+Nicolas Chevalier, Bull
+  nicolas.chevalier@bull.net
+Nysal Jan K A, IBM
+  jnysal@in.ibm.com
+Orion Poplawski, Individual
+  orion@cora.nwra.com
+Oscar Vega-Gisbert, Universitat Politecnica de Valencia
+  ovega@dsic.upv.es
+Pak Lui, Sun
+  pak.lui@sun.com
+Pascal Deveze, Bull
+  pascal.deveze@atos.net
+Patrick Geoffray, Myricom
+  patrick@myri.com
+Pavel Shamis, Mellanox, Oak Ridge National Laboratory
+  pasharesearch@gmail.com
+  shamisp@ornl.gov
+Pierre Lemarinier, University of Tennessee-Knoxville
+  lemarini@icl.utk.edu
+Piotr Lesnicki, Bull
+  piotr.lesnicki@ext.bull.net
+Prabhanjan Kambadur, Indiana University
+  pkambadu@osl.iu.edu
+Rainer Keller, High Performance Computing Center, Stuttgart, Oak Ridge National Laboratory, Hochschule fuer Technik Stuttgart
+  rainer.keller@hlrs.de
+Ralph Castain, Los Alamos National Laboratory, Cisco, Greenplum, Intel
+  rhc@open-mpi.org
+Reese Faucette, Cisco
+  rfaucett@cisco.com
+Rich Graham, Los Alamos National Laboratory, Oak Ridge National Laboratory, Mellanox
+  richardg@mellanox.com
+Rob Awles, Los Alamos National Laboratory
+  rta@lanl.gov
+Rob Latham, Argonne National Laboratory
+  robl@mcs.anl.gov
+Rolf vandeVaart, Sun, Oracle, NVIDIA
+  rvandevaart@nvidia.com
+Ron Brightwell, Sandia National Laboratory
+  rbbrigh@sandia.gov
+Ryan Grant, Sandia National Laboratory
+  regrant233@gmail.com
+  regrant@sandia.gov
+Sami Ayyorgun, Los Alamos National Laboratory
+  sami@lanl.gov
+Samuel Gutierrez, Los Alamos National Laboratory
+  samuel@lanl.gov
+Sayantan Sur, The Ohio State University
+  surs@osu.edu
+Sharon Melamed, Voltaire
+  sharonm@voltaire.com
+Shiqing Fan, High Performance Computing Center, Stuttgart
+  shiqing@hlrs.de
+Steve Wise, OpenGrid Computing
+  swise@opengridcomputing.com
+Sushant Sharma, Los Alamos National Laboratory
+  sushant@lanl.gov
+Sven Stork, High Performance Computing Center, Stuttgart
+  stork@hlrs.de
+Swen Boehm, Oak Ridge National Laboratory
+  sboehm@ornl.gov
+Sylvain Jeaugey, Bull, NVIDIA
+  sjeaugey@nvidia.com
+  sylvain.jeaugey@bull.net
+Teng Lin, Individual
+  teng.lin@gmail.com
+Terry Dontje, Sun, Oracle
+  terry.dontje@oracle.com
+Thananon Patinyasakdikul, Cisco, University of Tennessee-Knoxville
+  apatinya@cisco.com
+  tpatinya@utk.edu
+Thara Angskun, University of Tennessee-Knoxville
+  angskun@cs.utk.edu
+Thomas Herault, University of Tennessee-Knoxville
+  herault@icl.utk.edu
+Tim Mattox, Indiana University, Cisco, Individual
+  tmattox@gmail.com
+Tim Prins, Indiana University, Los Alamos National Laboratory
+  tprins@lanl.gov
+Tim Woodall, Los Alamos National Laboratory
+  twoodall@lanl.gov
+Todd Kordenbrock, Sandia National Laboratory
+  thkgcode@gmail.com
+  thkorde@sandia.gov
+Tom Naughton, Oak Ridge National Laboratory
+  naughtont@ornl.gov
+Tomislav Janjusic, Mellanox
+  tomislavj@mngx-apl-01.mtl.labs.mlnx
+Torsten Hoefler, Indiana University, Technische Universtaet Chemnitz
+  htor@osl.iu.edu
+Valentin Petrov, Mellanox
+  valentinp@mellanox.com
+Vasily Filipov, Mellanox
+  vasily@mellanox.com
+Vishal Sahay, Indiana University
+  vsahay@osl.iu.edu
+Vishwanath Venkatesan, University of Houston, Intel
+  vvenkates@gmail.com
+Weikuan Yu, Los Alamos National Laboratory
+  yuw@lanl.gov
+Wesley Bland, University of Tennessee-Knoxville
+  wbland@icl.utk.edu
+William Throwe, Individual
+  wtt6@cornell.edu
+Yael Dayan, Mellanox
+  yaeld@mellanox.com
+Yevgeny Kliteynik, Mellanox
+  kliteyn@mellanox.co.il
+Yohann Burette, Intel
+  yohann.burette@intel.com
+Yossi Itigin, Mellanox
+  yosefe@mellanox.com
+Zhi Ming Wang, IBM
+  wangzm@cn.ibm.com
diff --git a/VERSION b/VERSION
index 5763ae7a69..4b5395919e 100644
--- a/VERSION
+++ b/VERSION
@@ -23,7 +23,7 @@ release=1
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=a1
+greek=rc1
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
@@ -81,16 +81,16 @@ date="Unreleased developer copy"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libmpi_so_version=20:0:0
+libmpi_so_version=20:1:0
 libmpi_cxx_so_version=20:0:0
 libmpi_mpifh_so_version=20:0:0
 libmpi_usempi_tkr_so_version=20:0:0
 libmpi_usempi_ignore_tkr_so_version=20:0:0
 libmpi_usempif08_so_version=20:0:0
 libopen_rte_so_version=20:0:0
-libopen_pal_so_version=20:0:0
-libmpi_java_so_version=20:0:0
-liboshmem_so_version=20:0:0
+libopen_pal_so_version=21:0:1
+libmpi_java_so_version=20:1:0
+liboshmem_so_version=20:1:0
 
 # "Common" components install standalone libraries that are run-time
 # linked by one or more components.  So they need to be versioned as
@@ -106,5 +106,5 @@ libmca_orte_common_alps_so_version=20:0:0
 libmca_opal_common_cuda_so_version=20:0:0
 libmca_opal_common_libfabric_so_version=20:0:0
 libmca_opal_common_sm_so_version=20:0:0
-libmca_opal_common_ugni_so_version=20:0:0
+libmca_opal_common_ugni_so_version=20:1:0
 libmca_opal_common_verbs_so_version=20:0:0
diff --git a/contrib/dist/make-authors.pl b/contrib/dist/make-authors.pl
index 1084ad9a16..0ff69a0e3b 100755
--- a/contrib/dist/make-authors.pl
+++ b/contrib/dist/make-authors.pl
@@ -1,9 +1,10 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2016 Cisco Systems, Inc.  All rights reserved.
 #
 
 use strict;
+
 use Data::Dumper;
 
 # Ensure that we're in the root of a writeable Git clone
@@ -14,149 +15,213 @@
 
 ######################################################################
 
+my $header_sep = "-----";
+my $unknown_org = "********* NO ORGANIZATION SET ********";
+
+my $people;
+
+######################################################################
+
 # Run git log to get a list of committers
 
-my $committers;
-open (GIT, "git log --pretty=format:%ae|") || die "Can't run 'git log'.";
+open (GIT, "git log --format=tformat:'%aN <%aE>'|") || die "Can't run 'git log'.";
 while (<GIT>) {
     chomp;
-    m/^\s*([\S]+)\s*$/;
+    m/^\s*(.+)\s+<(.+)>\s*$/;
+
+    if (!exists($people->{$1})) {
+        # The person doesn't exist, so save a new entry
+        $people->{$1} = {
+            name => $1,
+            org => $unknown_org,
+            emails => {
+                lc($2) => 1,
+            }
+        };
 
-    if (!exists($committers->{$1})) {
-        $committers->{$1} = { };
-        print "Found Git commit email: $1\n";
+
+        print "Found Git committer: $1 <$2>\n";
+    } else {
+        # The person already exists, so just add (or overwrite) this
+        # email address
+        $people->{$1}->{emails}->{$2} = 1;
     }
 }
 close(GIT);
 
-# Read the existing AUTHORS file to get the header, footer, and Git
-# email ID -> (gecos, affiliation) mappings.
+######################################################################
+
+# Read the existing AUTHORS file
 
 my $header;
-my $footer;
 
 print "Matching Git emails to existing names/affiliations...\n";
 
+sub save {
+    my $current = shift;
+
+    print "Saving person from AUTHORS: $current->{name}\n";
+
+    # We may overwrite an entry written from the git log, but that's
+    # ok
+    $people->{$current->{name}} = $current;
+}
+
 open (AUTHORS, "AUTHORS") || die "Can't open AUTHORS file";
 my $in_header = 1;
-my $in_footer = 0;
+my $current = undef;
 while (<AUTHORS>) {
     chomp;
     my $line = $_;
 
-    # Slurp down header lines until we hit a line that begins with an
-    # Git email
+    # Slurp down header lines until we hit a line that begins with
+    # $header_sep
     if ($in_header) {
-        foreach my $git_email (keys(%{$committers})) {
-            if ($line =~ /$git_email\s+/) {
-                $in_header = 0;
-            }
-        }
-        if ($in_header) {
-            $header .= "$_\n";
+        $header .= "$line\n";
+
+        if ($_ =~ /^$header_sep/) {
+            $in_header = 0;
+
+            # There should be a blank line after this, too
+            $header .= "\n";
         }
+        next;
     }
 
-    # If we're in the body, parse to get the existing Git emails, gecos,
-    # and affiliations
-    if (!$in_header && !$in_footer) {
-
-        # Make sure we have a line that begins with an Git email;
-        # otherwise, fall through to the footer.
-        my $found = undef;
-        my $git_email;
-        foreach $git_email (keys(%{$committers})) {
-            if ($line =~ /$git_email\s+/) {
-                $found = $git_email;
-                last;
-            }
-        }
-        if (!$found) {
-            $in_footer = 1;
+    # Skip blank lines
+    next
+        if ($line =~ /^\s*$/);
+
+    # Format of body:
+    #
+    # NAME, Affiliation 1[, Affiliation 2[...]]
+    #   Email address 1
+    #   [Email address 2]
+    #   [...]
+    # NAME, Affiliation 1[, Affiliation 2[...]]
+    #   Email address 1
+    #   [Email address 2]
+    #   [...]
+
+    # Found a new email address for an existing person
+    if ($line =~ /^  /) {
+        m/^  (.+)$/;
+        $current->{emails}->{lc($1)} = 1;
+
+        next;
+    } else {
+        # Found a new person; save the old entry
+        save($current)
+            if (defined($current));
+
+        $current = undef;
+        $current->{org} = $unknown_org;
+        if ($line =~ m/^(.+?),\s+(.+)$/) {
+            $current->{name} = $1;
+            $current->{org} = $2;
         } else {
-            $line =~ m/^$found\s+(.+?)\s{2,}(.+)$/;
-            my $gecos = $1;
-            my $aff = $2;
-
-            if ($gecos =~ /^\s+$/) {
-                $gecos = "<UNKNOWN>";
-            } else {
-                $committers->{$found}->{gecos} = $gecos;
-            }
-            if ($aff =~ /^\s+$/) {
-                $aff = "<UNKNOWN>";
-            } else {
-                $committers->{$found}->{affiliation} = $aff;
-            }
-            print "Git email $found matches: $gecos / $aff\n";
+            $current->{name} = $line;
         }
-    }
 
-    # If we're in the footer, just save all the lines
-    if ($in_footer) {
-        $footer .= "$_\n";
+        next;
     }
 }
+
+save($current)
+    if (defined($current));
+
 close(AUTHORS);
 
-# Figure out the 3 column widths.  The last line of the header
-# contains -'s for each of the columns.
+######################################################################
 
-$header =~ m/\n([\-\s]+?)$/m;
-my $div_line = $1;
-my @divs = split(/ /, $div_line);
-my $id_col = length($divs[0]);
-my $gecos_col = length($divs[1]);
-my $aff_col = length($divs[2]);
+# Output a new AUTHORS file
 
-# Print out a new AUTHORS file
 open (AUTHORS, ">AUTHORS.new") || die "Can't write to AUTHORS file";
+
 print AUTHORS $header;
-my $i;
-my $have_unknowns = 0;
-foreach my $git_email (sort(keys(%${committers}))) {
-    # Skip the automated accounts
-    next
-        if ($git_email eq "no-author\@open-mpi.org" ||
-            $git_email eq "mpiteam\@open-mpi.org");
-
-    print AUTHORS $git_email;
-    $i = length($git_email);
-    while ($i <= $id_col) {
-        print AUTHORS ' ';
-        ++$i;
+
+my @people_with_unknown_orgs;
+my $email_dups;
+
+my @sorted_people = sort(keys(%{$people}));
+foreach my $p (@sorted_people) {
+    print AUTHORS $p;
+    if (exists($people->{$p}->{org})) {
+        print AUTHORS ", $people->{$p}->{org}";
+
+        # Record this so that we can warn about it
+        push(@people_with_unknown_orgs, $p)
+            if ($people->{$p}->{org} eq $unknown_org);
     }
+    print AUTHORS "\n";
+
+    foreach my $e (sort(keys(%{$people->{$p}->{emails}}))) {
+        # Sanity check: make sure this email address does not show up
+        # with any other person/name
+        my $dup;
+        foreach my $p2 (@sorted_people) {
+            next
+                if ($p eq $p2);
+
+            foreach my $e2 (keys(%{$people->{$p2}->{emails}})) {
+                if ($e eq $e2) {
+                    $dup = $p2;
+
+                    # Record this so that we can warn about it
+                    if ($p le $p2) {
+                        $email_dups->{$p} = $p2;
+                    } else {
+                        $email_dups->{$p2} = $p;
+                    }
+                    last;
+                }
+            }
 
-    # if we have gecos/affiliation, print them.  Otherwise, just end
-    # the line here
-    if ((exists($committers->{$git_email}->{gecos}) &&
-         $committers->{$git_email}->{gecos} !~ /^\s+$/) ||
-        (exists($committers->{$git_email}->{affiliation}) &&
-         $committers->{$git_email}->{affiliation} !~ /^\s+$/)) {
-        print AUTHORS $committers->{$git_email}->{gecos};
-        $i = length($committers->{$git_email}->{gecos});
-        while ($i <= $gecos_col) {
-            print AUTHORS ' ';
-            ++$i;
+            last
+                if (defined($dup));
         }
 
-        print AUTHORS $committers->{$git_email}->{affiliation}
-            if (exists($committers->{$git_email}->{affiliation}));
-    } else {
-        $have_unknowns = 1;
+        print AUTHORS "  $e";
+        print AUTHORS " (**** DUPLICATE EMAIL ADDRESS WITH $dup ***)"
+            if (defined($dup));
+        print AUTHORS "\n";
     }
-    print AUTHORS "\n";
 }
-print AUTHORS $footer;
 close(AUTHORS);
 
+# We have a new AUTHORS file!  Replace the old one.
 unlink("AUTHORS");
 rename("AUTHORS.new", "AUTHORS");
 
 print "New AUTHORS file written.\n";
-if ($have_unknowns) {
-    print "*** WARNING: There were Git committers with unknown real names and/or\n*** affiliations.  You *MUST* edit the AUTHORS file to fill them in!\n";
-} else {
-    print "All Git emails were matched! No need to hand-edit the AUTHORS file.\n";
+
+######################################################################
+
+# Output any relevant warnings
+
+my $warned = 0;
+if ($#people_with_unknown_orgs >= 0) {
+    $warned = 1;
+    print "\n*** WARNING: The following people have unspecified organiations:\n";
+    foreach my $p (@people_with_unknown_orgs) {
+        print "***   $p\n";
+    }
+}
+
+my @k = sort(keys(%{$email_dups}));
+if ($#k >= 0) {
+    $warned = 1;
+    print "\n*** WARNING: The following people had the same email address:\n";
+    foreach my $p (@k) {
+        print "***   $p, $email_dups->{$p}\n";
+    }
+}
+
+if ($warned) {
+    print "
+*******************************************************************************
+*** YOU SHOULD EDIT THE .mailmap AND/OR AUTHORS FILE TO RESOLVE THESE WARNINGS!
+*******************************************************************************\n";
 }
 
+exit($warned);