diff --git a/AUTHORS b/AUTHORS
index db2897e6a..e48916d78 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Daniel Martí <mvdan@mvdan.cc>
 Dennis Wilson <dw@risu.io>
 Dominik Heidler <dominik@heidler.eu>
 Emil Hessman <emil@hessman.se>
+Federico Castagnini <federico.castagnini@gmail.com>
 Felix Ableitner <me@nutomic.com>
 Felix Unterpaintner <bigbear2nd@gmail.com>
 Gilli Sigurdsson <gilli@vx.is>
diff --git a/NICKS b/NICKS
index 0e34fd796..6dd0feb89 100644
--- a/NICKS
+++ b/NICKS
@@ -16,6 +16,7 @@ calmh		<jakob@nym.se>
 cdata		<chris@scriptolo.gy>
 ceh		<emil@hessman.se>
 cqcallaw	<enlightened.despot@gmail.com>
+facastagnini	<federico.castagnini@gmail.com>
 filoozoom	<philippe@schommers.be>
 frioux		<frew@afoolishmanifesto.com> <frioux@gmail.com>
 gillisig	<gilli@vx.is>
diff --git a/gui/index.html b/gui/index.html
index 73e0a29a8..21256a8a7 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -940,6 +940,7 @@
           <li>Dennis Wilson</li>
           <li>Dominik Heidler</li>
           <li>Emil Hessman</li>
+          <li>Federico Castagnini</li>
           <li>Felix Ableitner</li>
           <li>Felix Unterpaintner</li>
           <li>Gilli Sigurdsson</li>