diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index ec7792c..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,54 +0,0 @@
-
-iperf3 is a complete rewrite of iperf2, with a goal of making the
-code smaller and easier to maintain, and to support a client library 
-verion of the functionality.
-
-
-Main designer: Jon Dugan, ESnet
-Original implementation: Seth Elliott, Kaustubh Prabhu (summer students)
-Many bug fixes and new features: Jef Poskanzer, ESnet
-
-
--------------------------------------------------
-
-iperf3 contains some orginal code from iperf2.
-
-Here are the authors of iperf2.
-
-
-Mark Gates
-Alex Warshavsky 
-
-  * original authors
-
-Ajay Tirumala
-
-  * general improvements 
-
-Jim Ferguson <ferguson@ncsa.uiuc.edu>
-
-  * Project management
-
-Jon Dugan <jdugan@x1024.net>
-
-  * Project maintainer and release coordinator
-  * various patches and autoconf fixes, general maintenance
-
-Feng Qin
-Kevin Gibbs
-
-  * windows porting work
-
-John Estabrook <jestabro@ncsa.uiuc.edu>
-
-Andrew Gallatin <gallatin@gmail.com>
-  * threading fix and non Linux performance improvements
-
-Stephen Hemminger <shemminger@linux-foundation.org>
-  * Linux congestion control selection and theading improvements
-
-Nathan Jones <nmjones@users.sourceforge.net>
-  * patch for underflow when value specified in -n is not a multiple of -l
-
-Gerrit Renker <grenker@users.sourceforge.net>
-  * replace costly gettimeofday() with nanonsleep()
diff --git a/docs/dev.rst b/docs/dev.rst
index 41a87a8..50aa8a4 100644
--- a/docs/dev.rst
+++ b/docs/dev.rst
@@ -195,3 +195,16 @@ Release Engineering Checklist
      tree) and deploy a new build of the documentation to GitHub
      Pages.
 
+Code Authors
+------------
+
+The main authors of iperf3 are (in alphabetical order):  Jon Dugan,
+Seth Elliott, Bruce A. Mah, Jeff Poskanzer, Kaustubh Prabhu.
+Additional code contributions have come from (also in alphabetical
+order):  Mark Ashley, Aaron Brown, Aeneas Jaißle, Susant Sahani, Brian
+Tierney.
+
+iperf3 contains some original code from iperf2.  The authors of iperf2
+are (in alphabetical order): Jon Dugan, John Estabrook, Jim Ferbuson,
+Andrew Gallatin, Mark Gates, Kevin Gibbs, Stephen Hemminger, Nathan
+Jones, Feng Qin, Gerrit Renker, Ajay Tirumala, Alex Warshavsky.
diff --git a/src/iperf3.1 b/src/iperf3.1
index b252049..d055c6b 100644
--- a/src/iperf3.1
+++ b/src/iperf3.1
@@ -165,14 +165,9 @@ in a JSON object; otherwise it is appended at the bottom of the
 human-readable output.
 
 .SH AUTHORS
-Iperf was originally written by Mark Gates and Alex Warshavsky.
-Man page and maintence by Jon Dugan <jdugan at x1024 dot net>.
-Other contributions from Ajay Tirumala, Jim Ferguson,
-Feng Qin,
-Kevin Gibbs,
-John Estabrook <jestabro at ncsa.uiuc.edu>,
-Andrew Gallatin <gallatin at gmail.com>,
-Stephen Hemminger <shemminger at linux-foundation.org>
+A list of the contributors to iperf3 can be found within the
+documentation located at
+\fChttp://software.es.net/iperf/dev.html#authors\fR.
 
 .SH "SEE ALSO"
 libiperf(3),
diff --git a/src/libiperf.3 b/src/libiperf.3
index 3e5e196..dc15a1e 100644
--- a/src/libiperf.3
+++ b/src/libiperf.3
@@ -96,14 +96,9 @@ The full runnable source code can be found in the examples subdirectory
 of the iperf3 source tree.
 
 .SH AUTHORS
-Iperf was originally written by Mark Gates and Alex Warshavsky.
-Man page and maintence by Jon Dugan <jdugan at x1024 dot net>.
-Other contributions from Ajay Tirumala, Jim Ferguson,
-Feng Qin,
-Kevin Gibbs,
-John Estabrook <jestabro at ncsa.uiuc.edu>,
-Andrew Gallatin <gallatin at gmail.com>,
-Stephen Hemminger <shemminger at linux-foundation.org>
+A list of the contributors to iperf3 can be found within the
+documentation located at
+\fChttp://software.es.net/iperf/dev.html#authors\fR.
 
 .SH "SEE ALSO"
 iperf3(1),