diff --git a/AUTHORS b/AUTHORS
index 07e16a49b..597291525 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ Maxime Lavigne <duguigne@gmail.com>
 Michael Morrissey <jersey@gmail.com>
 Michael Vincent Zuffoletti <mikezuff@gmail.com>
 Nick O'Neill <nick.oneill@gmail.com>
+Niklas Merz <niklasmerz@linux.com>
 Nolan Darilek <nolan@thewordnerd.info>
 Peter Etelej <peter@etelej.com>
 Philio <phil@bayfmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7e1faa9b1..b6ca1ba63 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -73,6 +73,7 @@ Michael Vincent Zuffoletti <mikezuff@gmail.com>
 Nick O'Neill <nick.oneill@gmail.com>
 Nico Weber <thakis@chromium.org>
 Nigel Tao <nigeltao@golang.org>
+Niklas Merz <niklasmerz@linux.com>
 Nolan Darilek <nolan@thewordnerd.info>
 Pawel Szczur <pawelszczur@gmail.com>
 Paul Lindner <lindner@inuus.com>