X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=AUTHORS;h=156911920aa6518563d8b31575d7e6453605fe3c;hp=532543f4edb47f854fa28df65f01bfb58b064951;hb=4c85542894f7fca823b119b05e07179deb24229a;hpb=950fb8e916b0e248dcaa72c96859acd6046683aa

diff --git a/AUTHORS b/AUTHORS
index 532543f4..15691192 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,20 @@
 Main tinc authors:
-Guus Sliepen <guus@sliepen.warande.net>
-Ivo Timmermans <itimmermans@bigfoot.com>
+- Guus Sliepen <guus@tinc-vpn.org>
+- Ivo Timmermans (inactive)
+
+Significant contributions from:
+- Michael Tokarev <mjt@tls.msk.ru>
+- Florian Forster <octo@verplant.org>
 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
  the syslog 1.3 sources.
+
+* src/bsd/tunemu.c and tunemu.h are by Friedrich Schöller
+  <friedrich.schoeller@gmail.com>
+
+Also some of the macro files in the directory m4, and their
+accompanying files in lib, were taken from GNU fileutils.
+
+Please see the file THANKS for more information on contributions from
+users.