diff --git a/.mailmap b/.mailmap
index 06e1568083..f47ebcdce7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,6 +51,7 @@ Dirk Römmen <dirk.roemmen@cslab.de> Dirk Römmen <dro@cslab.de>
 Disha Daniel <ddaniel@empirix.com> dishadaniel <ddaniel@empirix.com>
 Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
 Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
+Dylan Ulis  <daulis0@gmail.com> D. Ulis <daulis0@gmail.com>
 Ed Beroset <beroset@ieee.org> Ed Beroset <beroset@mindspring.com>
 Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
 Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
@@ -78,6 +79,7 @@ Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de>
 Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@localhost>
 Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@MacBookIrene.local>
 Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org>
+Jaap Keuter <jaap.keuter@xs4all.nl> Jaap Keuter <jkeuter@aimvalley.nl>
 Jaime Caamaño Ruiz <jcaamano@suse.com> Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
 Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl>
 Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com>
@@ -178,6 +180,7 @@ Tengfei Chang <tengfei.chang@inria.fr> tchang <tengfei.chang@inria.fr>
 Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
 Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassau@hotmail.fr>
 Uli Heilmeier <uh@heilmeier.eu> Uli Heilmeier <openid@heilmeier.eu>
+Vadim Fedorenko <vadimjunk@gmail.com> Vadim Fedorenko <junk@yandex-team.ru>
 Vasil Velichkov <vvvelichkov@gmail.com> Vasil Velichckov <vvvelichkov@gmail.com>
 Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
 Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>
diff --git a/AUTHORS b/AUTHORS
index cc16275ca0..e9ab00cc24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4072,7 +4072,6 @@ Claudius Zingerli	<czingerl[AT]gmail.com>
 Cody Doucette		<doucette[AT]bu.edu>
 Craig Jackson		<cejackson51[AT]gmail.com>
 Cédric Delmas		<cedricde[AT]outlook.fr>
-D. Ulis			<daulis0[AT]gmail.com>
 D. W. Poon		<dwpoon[AT]mail.ubc.ca>
 Daan De Meyer		<daan.j.demeyer[AT]gmail.com>
 Dan Robertson		<danlrobertson89[AT]gmail.com>
@@ -4123,6 +4122,7 @@ Dom Gifford		<Dominic.Gifford[AT]atmel.com>
 Dominic Chen		<d.c.ddcc[AT]gmail.com>
 Doug Brown		<doug[AT]downtowndougbrown.com>
 Dr. Lars Voelker	<lars.voelker[AT]bmw.de>
+Dylan Ulis		<daulis0[AT]gmail.com>
 Ebben Aries		<exa[AT]fb.com>
 Ed Beroset		<beroset[AT]ieee.org>
 Edward Dao		<edmailbox[AT]gmail.com>
@@ -4199,7 +4199,6 @@ Ivan Nardi		<nardi.ivan[AT]gmail.com>
 Ivan Secerin		<ivan.severin.m[AT]gmail.com>
 J. Bruce Fields		<bfields[AT]redhat.com>
 JC Wren			<jcwren[AT]jcwren.com>
-Jaap Keuter		<jkeuter[AT]aimvalley.nl>
 Jaime Caamaño Ruiz	<jcaamano[AT]suse.com>
 Jakub Pawlowski		<jpawlowski[AT]google.com>
 James Coleman		<jamesc[AT]dspsrv.com>
@@ -4506,7 +4505,6 @@ Ulf			<ulf33286[AT]gmail.com>
 Uli Schlachter		<psychon[AT]znc.in>
 Umberto Corponi		<umberto.corponi[AT]athonet.com>
 Uri Simchoni		<urisimchoni[AT]gmail.com>
-Vadim Fedorenko		<junk[AT]yandex-team.ru>
 Vadim Fedorenko		<vadimjunk[AT]gmail.com>
 Vadim Yanitskiy		<axilirator[AT]gmail.com>
 Valentin Vidic		<Valentin.Vidic[AT]CARNet.hr>