diff --git a/.mailmap b/.mailmap
index b7d8b1b2a8..e732b87db7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,12 +18,14 @@ Antony Bridle <ant.bridle@gmail.com> antony.bridle <ant.bridle@gmail.com>
 Balint Reczey <balint@balintreczey.hu> Balint Reczey <balint.reczey@canonical.com>
 Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
 Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org>
+Başak Kalfa <basakkalfa@gmail.com> basakkal <basakkalfa@gmail.com>
 Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru>
 Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com>
 Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
 Cal Turney <cturney@charter.net> Cal Turney <cturney111@gmail.com>
 Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
 Cedric Izoard <cedric.izoard@ceva-dsp.com> Cedric Izoard <cedric.izoard@rivierawaves.com>
+Chaoyong Zhou <bgnvendor@163.com> chaoyongzhou <bgnvendor@163.com>
 Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
 Chris Bontje <cbontje@gmail.com> chrisbontje <cbontje@gmail.com>
 Chris Brandson <chris.brandson@gmail.com> Chris Brandson <cjb@exegin.com>
@@ -92,6 +94,7 @@ Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com>
 Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com>
 Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
 João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt>
+Joeri de Ruiter <joeri@cypherpunk.nl> Joeri <joeri@cypherpunk.nl>
 John Miner <optommp@gmail.com> John <optommp@gmail.com>
 Jonathan Muñoz <jonathan.munoz@inria.fr> Jonathan Munoz <jonathan.munoz@inria.fr>
 Jorge Power <jpower@rsscorp.org> jorge power
@@ -141,6 +144,7 @@ Oliver Downard <oliver.downard@couchbase.com> olivermd <oliver.downard@couchbase
 Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com>
 Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
 Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
+Patrik Moško <patrikmosko95@gmail.com> PatrikMosko <patrikmosko95@gmail.com>
 Paul Williamson <paul@mustbeart.com> MustBeArt<paul@mustbeart.com>
 Pavel Strnad <strnadp@tiscali.cz> Pavel Strnad <pavel_strnad@hotmail.com>
 Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
diff --git a/AUTHORS b/AUTHORS
index 4a0da54171..d20a3343d2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4028,6 +4028,7 @@ Bartolo Otrit		<bartolootrit[AT]gmail.com>
 Baruch Siach		<baruch[AT]tkos.co.il>
 Basil			<addremover[AT]gmail.com>
 Bastien Bailly		<babassbailly[AT]free.fr>
+Başak Kalfa		<basakkalfa[AT]gmail.com>
 Ben Burwell		<bburwell[AT]lutron.com>
 Ben Fox-Moore		<ben.foxmoore[AT]accelleran.com>
 Benjamin Coddington	<bcodding[AT]redhat.com>
@@ -4053,6 +4054,7 @@ Cathy Yang		<cathy.y.yang[AT]ericsson.com>
 Cedric Izoard		<cedric.izoard[AT]ceva-dsp.com>
 Cenk Gündoğan		<cnkgndgn[AT]gmail.com>
 Chaitanya T K		<chaitanya.mgit[AT]gmail.com>
+Chaoyong Zhou		<bgnvendor[AT]163.com>
 Charles Nepveu		<charles.nepveu[AT]verint.com>
 Charlie Lenahan		<clenahan[AT]sonicbison.com>
 Chema Gonzalez		<chemag[AT]gmail.com>
@@ -4240,7 +4242,7 @@ Jim Walker		<jim[AT]couchbase.com>
 Jim Young		<jyoung[AT]gsu.edu>
 Jo Rueschel		<wireshark[AT]rueschel.de>
 Joakim Karlsson		<oakimk[AT]gmail.com>
-Joeri			<joeri[AT]cypherpunk.nl>
+Joeri de Ruiter		<joeri[AT]cypherpunk.nl>
 Johan Wahl		<johan.wahl[AT]ericsson.com>
 Johannes Singler	<johannes[AT]singler.name>
 John A. Thacker		<johnthacker[AT]gmail.com>
@@ -4399,7 +4401,7 @@ Patrice Fournier	<patrice.fournier[AT]ifax.com>
 Patricia Lindner	<plindner6912[AT]gmail.com>
 Patrick MacArthur	<pmacarth[AT]iol.unh.edu>
 Patrick Servello	<patrick.servello[AT]gmail.com>
-PatrikMosko		<patrikmosko95[AT]gmail.com>
+Patrik Moško		<patrikmosko95[AT]gmail.com>
 Patryk Nowak		<patryk.nowak[AT]tieto.com>
 Pau Espin Pedrol	<pespin[AT]sysmocom.de>
 Paul Emge		<paul.emge[AT]digidescorp.com>
@@ -4575,9 +4577,7 @@ Yury Gargay		<yury.gargay[AT]gmail.com>
 Zdeněk Žamberský	<zzdevel[AT]seznam.cz>
 Zhao Lin		<zlbinghamton[AT]gmail.com>
 anonsvn			<anonsvn[AT]localhost>
-basakkal		<basakkalfa[AT]gmail.com>
 cff339			<cff339[AT]gmail.com>
-chaoyongzhou		<bgnvendor[AT]163.com>
 cheloftus		<cheloftus[AT]gmail.com>
 kardam			<netkardam[AT]gmail.com>
 kkoizumi		<kkoizumi46[AT]gmail.com>