diff --git a/.mailmap b/.mailmap
index 2900771f..f223e264 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,3 +4,5 @@ Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
 Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
 Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
 Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
+Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com> 
+
diff --git a/AUTHORS b/AUTHORS
index c9db472a..ddc38a8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,27 +11,33 @@ Peter Jones <pjones@redhat.com>
 Luca Berra <bluca@comedia.it>
 Andrey Borzenkov <arvidjaar@mail.ru>
 Marc Grimme <grimme@atix.de>
-Bill Nottingham <notting@redhat.com>
+Andrey Borzenkov <arvidjaar@gmail.com>
 Daniel Drake <dsd@laptop.org>
+Bill Nottingham <notting@redhat.com>
 David Cantrell <dcantrell@redhat.com>
 Lance Albertson <lance@osuosl.org>
 Michael Ploujnikov <plouj@somanetworks.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Dan Horák <dan@danny.cz>
 Joey Boggs <jboggs@redhat.com>
+Mike Snitzer <snitzer@redhat.com>
+Peter Rajnoha <prajnoha@redhat.com>
+Vladislav Bogdanov <bubble@hoster-ok.com>
 Alexander Todorov <atodorov@redhat.com>
 Andy Lutomirski <luto@mit.edu>
 Dan Horák <dhorak@redhat.com>
 Dave Jones <davej@redhat.com>
 Frederic Crozat <fcrozat@mandriva.com>
+Glen Gray <slaine@slaine.org>
+Ian Dall <ian@beware.dropbear.id.au>
+James Laska <jlaska@redhat.com>
 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Luca Berra <bluca@vodka.it>
 Matt <smoothsailing72@hotmail.com>
+Matt Smith <shadowfax@gmx.com>
 Michal Schmidt <mschmidt@redhat.com>
-Mike Snitzer <msnitzer@redhat.com>
-Mike Snitzer <snitzer@redhat.com>
 Munehiro Matsuda <haro@kgt.co.jp>
-Peter Rajnoha <prajnoha@redhat.com>
+Pádraig Brady <P@draigBrady.com>
 Quentin Armitage <quentin@armitage.org.uk>
 Sergey Fionov <fionov@gmail.com>
 Thilo Bangert <thilo.bangert@gmx.net>