diff --git a/AUTHORS b/AUTHORS
index ee1cea5e..361aa493 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,106 +1,87 @@
+
 Designers
 =========
 
-crypto_sign/ed25519
--------------------
-Daniel J. Bernstein
-Niels Duif
-Tanja Lange
-Peter Schwabe
-Bo-Yin Yang
+blake2                                 Jean-Philippe Aumasson
+                                       Christian Winnerlein
+                                       Samuel Neves
+                                       Zooko Wilcox-O'Hearn
+
+chacha20                               Daniel J. Bernstein
+salsa20
+
+chacha20poly1305                       Adam Langley
+
+curve25519                             Daniel J. Bernstein
+
+curve25519xsalsa20poly1305             Daniel J. Bernstein
+
+ed25519                                Daniel J. Bernstein
+                                       Bo-Yin Yang
+                                       Niels Duif
+                                       Peter Schwabe
+                                       Tanja Lange
+
+poly1305                               Daniel J. Bernstein
+
+siphash                                Jean-Philippe Aumasson
+                                       Daniel J. Bernstein
+
+scrypt                                 Colin Percival
 
 Implementors
 ============
 
-crypto_core/hsalsa20
---------------------
-Daniel J. Bernstein
+crypto_aead/chacha20poly1305           Frank Denis
 
+crypto_box/curve25519xsalsa20poly1305  Daniel J. Bernstein
+
+crypto_core/hsalsa20                   Daniel J. Bernstein
 crypto_core/salsa20
---------------------
-Daniel J. Bernstein
-
 crypto_core/salsa2012
--------------------
-Daniel J. Bernstein
-
 crypto_core/salsa208
----------------------
-Daniel J. Bernstein
-
-crypto_hash/sha256
-------------------
-Colin Percival
 
+crypto_hash/sha256                     Colin Percival
 crypto_hash/sha512
-------------------
-Colin Percival
-
-crypto_auth/hmacsha256
-------------------
-Colin Percival
+crypto_hash/sha512256
 
+crypto_auth/hmacsha256                 Colin Percival
 crypto_auth/hmacsha512
-------------------
-Colin Percival
+crypto_auth/hmacsha512256
 
-crypto_scalarmult/curve25519/ref10
---------------------------------
-Daniel J. Bernstein
+crypto_scalarmult/curve25519/ref10     Daniel J. Bernstein
 
-crypto_scalarmult/curve25519/donna_c64
---------------------------------------
-Adam Langley (Google)
+crypto_scalarmult/curve25519/donna_c64 Adam Langley
 
-crypto_sign/ed25519
--------------------
-Daniel J. Bernstein
-Niels Duif
-Tanja Lange
-lead: Peter Schwabe
-Bo-Yin Yang
+crypto_secretbox/xsalsa20poly1305      Daniel J. Bernstein
 
-crypto_stream/aes128ctr
------------------------
-Daniel J. Bernstein
+crypto_sign/ed25519                    Peter Schwabe
+                                       Daniel J. Bernstein
+                                       Niels Duif
+                                       Tanja Lange
+                                       Bo-Yin Yang
 
-crypto_stream/aes256estream
----------------------------
-Hongjun Wu
+crypto_stream/aes128ctr                Peter Schwabe
 
-crypto_stream/salsa20
----------------------
-Daniel J. Bernstein
+crypto_stream/aes256estream            Hongjun Wu
+                                       Frank Denis
 
+crypto_stream/chacha20                 Daniel J. Bernstein
+
+crypto_stream/salsa20                  Daniel J. Bernstein
 crypto_stream/salsa2012
------------------------
-Daniel J. Bernstein
-
 crypto_stream/salsa208
-----------------------
-Daniel J. Bernstein
-
 crypto_stream/xsalsa20
-----------------------
-Daniel J. Bernstein
 
-crypto_shorthash/siphash24
---------------------------
-Jean-Philippe Aumasson
-Daniel J. Bernstein
+crypto_shorthash/siphash24             Jean-Philippe Aumasson
+                                       Daniel J. Bernstein
 
-crypto_generichash/blake2b
---------------------------
-Jean-Philippe Aumasson
-Samuel Neves
-Zooko Wilcox-O'Hearn
-Christian Winnerlein
+crypto_generichash/blake2b             Jean-Philippe Aumasson
+                                       Christian Winnerlein
+                                       Samuel Neves
+                                       Zooko Wilcox-O'Hearn
 
-crypto_onetimeauth/poly1305/donna
----------------------------------
-Andrew "floodyberry" Moon.
+crypto_onetimeauth/poly1305/donna      Andrew "floodyberry" Moon.
 
-crypto_pwhash/scryptsalsa208sha256
---------------------------------
-Colin Percival
-Alexander Peslyak
+crypto_pwhash/scryptsalsa208sha256     Colin Percival
+                                       Alexander Peslyak