diff --git a/.mailmap b/.mailmap
index fce0cbdbd0..bd428bd559 100644
--- a/.mailmap
+++ b/.mailmap
@@ -106,3 +106,7 @@ John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> <glaubitz@suse.com>
 Sjoerd Simons <sjoerd.simons@collabora.co.uk>
 Neil Brown <neil@brown.name>
+Michal Suchanek <msuchanek@suse.de> <hramrach@gmail.com>
+Michal Suchanek <msuchanek@suse.de>
+Bastien Nocera <hadess@hadess.net> <hadess@users.noreply.github.com>
+Umut Tezduyar Lindskog <umut@tezduyar.com>
diff --git a/NEWS b/NEWS
index 658e127bd2..a49d13ce14 100644
--- a/NEWS
+++ b/NEWS
@@ -85,32 +85,34 @@ CHANGES WITH 234:
           removed after the all plugins exit. So, if KERNEL_INSTALL_MACHINE_ID
           is empty, all plugins should not put anything in BOOT_DIR_ABS.
 
-          Contributions from: Adrian Heine né Lang, Aggelos Avgerinos,
-          Alexander Kurtz, Alexandros Frantzis, Alexey Brodkin, Amir Pakdel,
-          Amir Yalon, Anchor Cat, Bastien Nocera, Benjamin Gilbert, Charles
-          Plessy, Christian Brauner, Chris Chiu, Chris Lamb, codekipper,
-          Danielle Church, Daniel Drake, Daniel Molkentin, Daniel Rusek, Daniel
-          Wang, Davide Cavalca, David Herrmann, David Michael, Dax Kelson,
-          Dimitri John Ledkov, Djalal Harouni, Dušan Kazik, Elias Probst,
-          Evgeny Vereshchagin, Federico, Felipe Sateler, Felix Zhang,
-          flussence, Franck Bui, Gary Tierney, George McCollister, hadess,
-          hanklank, Hans de Goede, hecke, hendrikw01, Hristo Venev, Ian
-          Wienand, iplayinsun, Ivan Shapovalov, James Cowgill, James Hemsing,
-          Janne Heß, Jan Synacek, Jason Reeder, João Paulo Rechi Vita, John
-          Paul Adrian Glaubitz, Jörg Thalheim, Josef Gajdusek, Julian Mehne,
-          Kai Krakow, kjackiewicz, Lennart Poettering, Lluís Gili, Lucas
-          Werkmeister, Lukáš Nykrýn, Mantas Mikulėnas, Marcin Bachry, Mark
-          Stosberg, Martin Pitt, Matija Skala, Matthias Greiner, Matthijs van
-          Duin, Matt Clarkson, Max Resch, Michael Biebl, Michal Koutný, Michal
-          Sekletar, Nate Clark, Nathaniel R. Lewis, Neil Brown, Pascal S. de
-          Kloe, Patrik Flykt, Pat Riehecky, Paul Kocialkowski, Peter Hutterer,
-          Philip Withnall, Rafael Fontenelle, Ray Strode, Richard Maw, Roelf
-          Wichertjes, Ronny Chevalier, Sarang S. Dalal, Sjoerd Simons, slodki,
-          steelman, Susant Sahani, Ted W, Thomas Blume, Thomas Haller, Thomas
-          H. P. Andersen, Timothée Ravier, Tobias Jungel, Tobias Stoeckmann,
-          Tom Gundersen, Tom Yan, Torstein Husebø, umuttl, userwithuid,
-          Waldemar Brodkorb, WaLyong Cho, wiertel, Yusuke Nojima, Yu Watanabe,
-          Zbigniew Jędrzejewski-Szmek
+          Contributions from: Adrian Heine né Lang, Aggelos Avgerinos,
+          AlexanderKurtz, Alexandros Frantzis, Alexey Brodkin, Amir Pakdel,
+          Amir Yalon, Anchor Cat, Bastien Nocera, Benjamin Gilbert,
+          Charles Plessy, Christian Brauner, Chris Chiu, Chris Lamb,
+          codekipper, Danielle Church, Daniel Drake, Daniel Molkentin,
+          Daniel Rusek, Daniel Wang, Davide Cavalca, David Herrmann,
+          David Michael, Dax Kelson, Dimitri John Ledkov, Djalal Harouni,
+          Dušan Kazik, Elias Probst, Evgeny Vereshchagin, Federico,
+          Felipe Sateler, Felix Zhang, flussence, Franck Bui, Gary Tierney,
+          George McCollister, hanklank, Hans de Goede, hecke, hendrikw01,
+          Hristo Venev, Ian Wienand, iplayinsun, Ivan Shapovalov,
+          James Cowgill, James Hemsing, Janne Heß, Jan Synacek, Jason Reeder,
+          João Paulo Rechi Vita, John Paul Adrian Glaubitz, Jörg Thalheim,
+          Josef Gajdusek, Julian Mehne, Kai Krakow, kjackiewicz,
+          Lars Karlitski, Lennart Poettering, Lluís Gili, Lucas Werkmeister,
+          Lukáš Nykrýn, Mantas Mikulėnas, Marcin Bachry, Mark Stosberg,
+          Martin Pitt, Matija Skala, Matthias Greiner, Matthijs van Duin,
+          Matt Clarkson, Max Resch, Michael Biebl, Michal Koutný,
+          Michal Sekletar, Michal Suchanek, Nate Clark, Nathaniel R. Lewis,
+          Neil Brown, Pascal S. de Kloe, Patrik Flykt, Pat Riehecky,
+          Paul Kocialkowski, Peter Hutterer, Philip Withnall,
+          Rafael Fontenelle, Ray Strode, Richard Maw, Roelf Wichertjes,
+          Ronny Chevalier, Sarang S. Dalal, Sjoerd Simons, slodki, steelman,
+          Stefan Schweter, Susant Sahani, Ted W, Thomas Blume, Thomas Haller,
+          Thomas H. P. Andersen, Timothée Ravier, Tobias Jungel,
+          Tobias Stoeckmann, Tom Gundersen, Tom Yan, Torstein Husebø,
+          Umut Tezduyar Lindskog, userwithuid, Waldemar Brodkorb, WaLyong Cho,
+          wiertel, Yusuke Nojima, Yu Watanabe, Zbigniew Jędrzejewski-Szmek,
 
         — Berlin, 2017-06-XX