diff --git a/.mailmap b/.mailmap
index 4fe0587a4..379f9cb23 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@ Adam Misnyovszki <amisnyov@redhat.com> <amisnyov@redhat.com>
 Endi Sukma Dewata <edewata@redhat.com>   System Administrator <root@dhcp-100-3-211.bos.redhat.com>
 Endi Sukma Dewata <edewata@redhat.com>
 Gabe Alford     <redhatrises@gmail.com>
+Ganna Kaihorodova <gkaihoro@redhat.com> <gkaihoro@example.com>
 Jan Zelený      <jzeleny@redhat.com>
 Jim Meyering    <meyering@redhat.com>  <jim@meyering.net>
 John Dennis     <jdennis@redhat.com>   <jdennis@VAIO>
@@ -23,6 +24,7 @@ Lubomír Rintel  <lubo.rintel@gooddata.com> Lubomir Rintel <lubo.rintel@gooddata
 Lukáš Slebodník <lslebodn@redhat.com>
 Martin Bašti    <mbasti@redhat.com>
 Martin Košek    <mkosek@redhat.com>
+Tomáš Křížek    <tkrizek@redhat.com>
 Milan Kubík     <mkubik@redhat.com>
 Martin Nagy     <mnagy@redhat.com>     <mnagy@notas.(none)>
 Nathaniel McCallum <npmccallum@redhat.com> <nathaniel@themccallums.org>
@@ -36,6 +38,8 @@ Pavel Zůna      <pzuna@redhat.com>     <root@testbox.winry>
 Pavel Zůna      <pzuna@redhat.com>     <root@webui.pzuna>
 Petr Špaček     <pspacek@redhat.com>
 Petr Voborník   <pvoborni@redhat.com>
+Pavel Vomáčka   <pvomacka@redhat.com>
+Pavel Vomáčka   <pvomacka@redhat.com>  tester <test@example.com>
 Rich Megginson  <rmeggins@redhat.com>  <rich@localhost.localdomain>
 Rob Crittenden  <rcritten@redhat.com>
 Rob Crittenden  <rcritten@redhat.com>  <rcrit@ike.greyoak.com>
@@ -48,6 +52,7 @@ Rob Crittenden  <rcritten@redhat.com>  <rcrit@tove.greyoak.com>
 Simo Sorce      <ssorce@redhat.com>    <simo@redhat.com>
 Sumit Bose      <sbose@redhat.com>     <sbose@ipa17-devel.ipa17.devel>
 Sumit Bose      <sbose@redhat.com>     <sbose@ipa18-devel.ipa18.devel>
+Tibor Dudlák    <tdudlak@redhat.com>   <tibor.dudlak@gmail.com>
 Thierry Bordaz  <tbordaz@redhat.com>
 Thierry Bordaz  <tbordaz@redhat.com>   <root@vm-205.idm.lab.eng.brq.redhat.com>
 Thierry Bordaz  <tbordaz@redhat.com>   <root@vm-035.idm.lab.eng.brq.redhat.com>
diff --git a/Contributors.txt b/Contributors.txt
index 7a1913bbe..878fc1104 100644
--- a/Contributors.txt
+++ b/Contributors.txt
@@ -18,13 +18,13 @@ Developers:
 	Thierry Bordaz
 	Sumit Bose
 	François Cami
+	Petr Čech
 	Xiao-Long Chen
 	Jan Cholasta
 	Yuri Chornoivan
 	Brian Cook
 	Rob Crittenden
 	Frank Cusack
-	Petr Čech
 	Nalin Dahyabhai
 	Don Davis
 	John Dennis
@@ -34,6 +34,7 @@ Developers:
 	Lenka Doudova
 	Benjamin Drung
 	Patrice Duc-Jacquet
+	Tibor Dudlák
 	Drew Erny
 	Oleg Fayans
 	Jérôme Fenal
@@ -43,6 +44,7 @@ Developers:
 	Nick Hatch
 	Christian Heimes
 	Jakub Hrozek
+	Ganna Kaihorodova
 	Abhijeet Kasurde
 	Nathan Kinder
 	Krzysztof Klimonda
@@ -50,6 +52,7 @@ Developers:
 	Martin Košek
 	Ludwig Krispenz
 	Ana Krivokapić
+	Tomáš Křížek
 	Milan Kubík
 	Ian Kumlien
 	David Kupka
@@ -57,6 +60,7 @@ Developers:
 	Peter Lacko
 	Stanislav Laznicka
 	Ade Lee
+	Ben Lipton
 	Karl MacMillan
 	Niranjan Mallapadi
 	Ales 'alich' Marecek
@@ -82,6 +86,7 @@ Developers:
 	Pete Rowley
 	Lenka Ryznarova
 	Thorsten Scherf
+	shanyin
 	Michael Simacek
 	Lars Sjostrom
 	Filip Skola
@@ -93,11 +98,12 @@ Developers:
 	Fraser Tweedale
 	Petr Viktorin
 	Petr Voborník
-	Pavel Vomacka
+	Pavel Vomáčka
 	Andrew Wnuk
 	Jason Woods
 	Adam Young
 	Jan Zelený
+	Michal Židek
 	Pavel Zůna
 
 Documentation: