diff --git a/AUTHORS b/AUTHORS
index b9ae2f41b..3803e7bec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,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 f4b1e6712..3fcf27ffc 100644
--- a/git.git-authors
+++ b/git.git-authors
@@ -45,6 +45,7 @@ ok	Brian Downing <bdowning@lavos.net>
 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>