diff --git a/.authors.yml b/.authors.yml
index 174eeaab3..6f361037f 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -64,7 +64,7 @@
   - Gilbert.Forsyth@capitalone.com
   - gforsyth@gwu.edu
   - gil@forsyth.dev
-  num_commits: 592
+  num_commits: 598
   first_commit: 2015-10-19 16:04:32
   github: gforsyth
 - name: Morten Enemark Lund
@@ -1013,8 +1013,8 @@
 - name: Eddie Peters
   email: edward.paul.peters@gmail.com
   alternate_emails:
-    - eddie@dinogalactic.com
-  num_commits: 2
+  - eddie@dinogalactic.com
+  num_commits: 3
   first_commit: 2019-05-10 06:18:40
   github: eppeters
 - name: shadow-light
@@ -1133,7 +1133,7 @@
   github: marciomazza
 - name: Noortheen Raja
   email: jnoortheen@gmail.com
-  num_commits: 195
+  num_commits: 197
   first_commit: 2020-03-15 10:13:56
   github: jnoortheen
 - name: Samuel Lotz
@@ -1364,7 +1364,7 @@
   first_commit: 2021-10-07 11:22:51
 - name: cmidkiff87
   email: 39914727+cmidkiff87@users.noreply.github.com
-  num_commits: 1
+  num_commits: 2
   first_commit: 2021-08-21 09:18:13
 - name: Michael Ramsey
   email: mike@hackerdise.me
@@ -1456,3 +1456,7 @@
   email: 172697+naveensrinivasan@users.noreply.github.com
   num_commits: 2
   first_commit: 2022-06-06 01:11:33
+- name: Hannes Römer
+  email: 16097755+hroemer@users.noreply.github.com
+  num_commits: 1
+  first_commit: 2022-06-27 22:21:34
diff --git a/.mailmap b/.mailmap
index 1657cee53..7adc8ce2b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -157,6 +157,7 @@ David <auscompgeek@users.noreply.github.com>
 Danmou <dmrtzn@gmail.com>
 Niklas Hambüchen <mail@nh2.me>
 Sébastien Pierre <sebastien.pierre@gmail.com>
+Eddie Peters <edward.paul.peters@gmail.com> Eddie Peters <eddie@dinogalactic.com>
 shadow-light <42055707+shadow-light@users.noreply.github.com>
 Jan Chren <dev.rindeal@gmail.com>
 Samuel Lotz <samuel.lotz@salotz.info>
@@ -185,7 +186,6 @@ Romain Bignon <romain@symlink.me>
 Owen Campbell <owen.campbell@tanti.org.uk>
 Steven Kryskalla <skryskalla@gmail.com>
 cclauss <cclauss@me.com>
-Eddie Peters <edward.paul.peters@gmail.com>
 Ke Zhang <kezhang@bnl.gov> ke-zhang-rd <kezhang@bnl.gov>
 László Vaskó <vlaci@balabit.hu>
 Allan Crooks <allan.crooks@sixtyten.org>
@@ -198,6 +198,7 @@ Faris A Chugthai <20028782+farisachugthai@users.noreply.github.com>
 Asaf Fisher <asaffisher@icloud.com>
 Samuel Dion-Girardeau <samueldg@users.noreply.github.com>
 Gabriele N. Tornetta <P403n1x87@users.noreply.github.com>
+cmidkiff87 <39914727+cmidkiff87@users.noreply.github.com>
 Stefano Rivera <github@rivera.za.net> Stefano Rivera <stefano@rivera.za.net>
 Naveen <172697+naveensrinivasan@users.noreply.github.com>
 Dan Allan <dallan@bnl.gov>
@@ -293,7 +294,6 @@ Shanmukha Vishnu <50124557+iam-shanmukha@users.noreply.github.com>
 Ali Uneri <auneri@users.noreply.github.com>
 Eleni E <Contessina@users.noreply.github.com>
 Kaarel Pärtel <kaarelp2rtel@gmail.com>
-cmidkiff87 <39914727+cmidkiff87@users.noreply.github.com>
 Michael Ramsey <mike@hackerdise.me>
 circuit10 <heath.mitchell27@gmail.com>
 Ryan Delaney <1139517+rpdelaney@users.noreply.github.com>
@@ -310,5 +310,6 @@ doronz88 <doron88@gmail.com>
 jbw3 <jbw3@users.noreply.github.com>
 Italo Cunha <cunha@users.noreply.github.com>
 Timmy Welch <timmy@narnian.us>
+Hannes Römer <16097755+hroemer@users.noreply.github.com>
 goodboy <tgoodlet@users.noreply.github.com>
 Atsushi Morimoto <atsushi.morimoto@dena.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 5660ed722..e89115a76 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -139,6 +139,7 @@ Authors are sorted by number of commits.
 * Danmou
 * Niklas Hambüchen
 * Sébastien Pierre
+* Eddie Peters
 * shadow-light
 * Jan Chren
 * Samuel Lotz
@@ -167,7 +168,6 @@ Authors are sorted by number of commits.
 * Owen Campbell
 * Steven Kryskalla
 * cclauss
-* Eddie Peters
 * Ke Zhang
 * László Vaskó
 * Allan Crooks
@@ -180,6 +180,7 @@ Authors are sorted by number of commits.
 * Asaf Fisher
 * Samuel Dion-Girardeau
 * Gabriele N. Tornetta
+* cmidkiff87
 * Stefano Rivera
 * Naveen
 * Dan Allan
@@ -275,7 +276,6 @@ Authors are sorted by number of commits.
 * Ali Uneri
 * Eleni E
 * Kaarel Pärtel
-* cmidkiff87
 * Michael Ramsey
 * circuit10
 * Ryan Delaney
@@ -292,5 +292,6 @@ Authors are sorted by number of commits.
 * jbw3
 * Italo Cunha
 * Timmy Welch
+* Hannes Römer
 * goodboy
 * Atsushi Morimoto