diff --git a/AUTHORS b/AUTHORS
index 7f6ea7756..5cd03382b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ Dmitry Kakurin
 Dmitry Kovega
 Emeric Fermas
 Emmanuel Rodriguez
+Florian Forster
 Holger Weiss
 Ingmar Vanhassel
 J. David Ibáñez
diff --git a/git.git-authors b/git.git-authors
index 591ffecf3..8dd53939b 100644
--- a/git.git-authors
+++ b/git.git-authors
@@ -44,6 +44,7 @@ ok	Boyd Lynn Gerber <gerberb@zenez.com>
 ok	Brian Gernhardt <benji@silverinsanity.com>
 ok	Christian Couder <chriscool@tuxfamily.org>
 ok	Daniel Barkalow <barkalow@iabervon.org>
+ok	Florian Forster <octo@verplant.org>
 ok	Holger Weiss <holger@zedat.fu-berlin.de>
 ok	Jeff King <peff@peff.net>
 ok	Johannes Schindelin <Johannes.Schindelin@gmx.de>