diff --git a/.authors.yml b/.authors.yml
index 0f4f43d..4c358cd 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -120,7 +120,7 @@
   email: paduct@list.ru
   aliases:
   - Bro
-  num_commits: 1
+  num_commits: 2
   first_commit: 2017-01-12 04:25:39
   github: Paduct
 - name: Steven Honeyman
@@ -230,7 +230,7 @@
   email: thomasr@fantasymail.de
   aliases:
   - ThomasR
-  num_commits: 2
+  num_commits: 4
   first_commit: 2016-02-28 08:15:46
   github: ThomasR
 - name: Sandro Jäckel
@@ -238,7 +238,7 @@
   github: SuperSandro2000
   aliases:
   - Sandro
-  num_commits: 2
+  num_commits: 3
   first_commit: 2019-03-15 03:31:46
 - name: maritaria
   email: bramkamies@gmail.com
@@ -335,7 +335,7 @@
   github: TJProgrammer
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 45
+  num_commits: 47
   first_commit: 2010-07-28 18:15:43
   github: astronautlevel
 - name: PhilipRoman
diff --git a/.mailmap b/.mailmap
index 55edaee..776b39b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,11 +22,13 @@ Philipp <creekpld@users.noreply.github.com>
 Tiago Almeida <tjamadeira@gmail.com>
 yochem <yochem@users.noreply.github.com>
 nl6720 <nl6720@gmail.com>
+Thomas Rosenau <thomasr@fantasymail.de> ThomasR <thomasr@fantasymail.de>
 Matthew Cox <matthewcpcox@gmail.com>
 Birger Jarl <codefuhrer@gmail.com>
 divinity76 <divinity76@gmail.com>
 CirKu17 <cirku17@gmail.com> CirKu17 <CirKu17@gmail.com>
 Geoffrey McClinsey <gmcclins@hashbang.sh>
+Sandro Jäckel <sandro.jaeckel@gmail.com> Sandro <sandro.jaeckel@gmail.com>
 Philipp Leo Dylong <creekpld@gmail.com>
 Huub de Beer <Huub@heerdebeer.org>
 Mikael O. Bonnier <mikael.bonnier@gmail.com>
@@ -34,11 +36,10 @@ Jeppe Fihl-Pearson <jeppe@tenzer.dk>
 Ondřej Ešler <ondrej.esler@intraworlds.com>
 Dan Kaplun <dbkaplun@gmail.com>
 Aryan Ebrahimpour <aryanebrahimpour@gmail.com>
+Paduct <paduct@list.ru> Bro <paduct@list.ru>
 Jody Leonard <me@jodyleonard.com>
 Daniel Jones <tortxof@gmail.com>
 Brandon Gulla <blgulla@rd6um-34106l.infosec.tycho.ncsc.mil> Brandon Gulla <brandon@brandongulla.com>
-Thomas Rosenau <thomasr@fantasymail.de> ThomasR <thomasr@fantasymail.de>
-Sandro Jäckel <sandro.jaeckel@gmail.com> Sandro <sandro.jaeckel@gmail.com>
 DesertPunk <38014530+DesertPunk@users.noreply.github.com>
 Shmueli Englard <shmueli.yosef@englard.net>
 Ondrej Esler <esler.ondrej@gmail.com>
@@ -67,7 +68,6 @@ Elliot Saba <staticfloat@gmail.com>
 Jason Ormand <jason.ormand1@gmail.com>
 Ian Mustafa <cuplizian@yahoo.com>
 Michał Kiełbowicz <jupblb@users.noreply.github.com>
-Paduct <paduct@list.ru> Bro <paduct@list.ru>
 Steven Honeyman <stevenhoneyman@users.noreply.github.com>
 Filip Szymański <fszymanski@users.noreply.github.com>
 kaernyk <kaernyk@users.noreply.github.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index ca847ab..53426dd 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,4 +1,4 @@
-All of the people who have made at least one contribution to xonsh.
+All of the people who have made at least one contribution to nanorc.
 Authors are sorted by number of commits.
 
 * Anthony Scopatz
@@ -14,11 +14,13 @@ Authors are sorted by number of commits.
 * Tiago Almeida
 * yochem
 * nl6720
+* Thomas Rosenau
 * Matthew Cox
 * Birger Jarl
 * divinity76
 * CirKu17
 * Geoffrey McClinsey
+* Sandro Jäckel
 * Philipp Leo Dylong
 * Huub de Beer
 * Mikael O. Bonnier
@@ -26,11 +28,10 @@ Authors are sorted by number of commits.
 * Ondřej Ešler
 * Dan Kaplun
 * Aryan Ebrahimpour
+* Paduct
 * Jody Leonard
 * Daniel Jones
 * Brandon Gulla
-* Thomas Rosenau
-* Sandro Jäckel
 * DesertPunk
 * Shmueli Englard
 * Ondrej Esler
@@ -59,7 +60,6 @@ Authors are sorted by number of commits.
 * Jason Ormand
 * Ian Mustafa
 * Michał Kiełbowicz
-* Paduct
 * Steven Honeyman
 * Filip Szymański
 * kaernyk