diff --git a/AUTHORS b/AUTHORS
index ed4569b8eda40bd59ee90195683e6eee2d9c71c2..acc25c4dedfe03651c5bd51b7cefc9af04d80f0f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,8 +13,12 @@ thread, device driver updates, other elements, multithreading Click
 
 Douglas S. J. De Couto
 decouto@lcs.mit.edu
-user-level elements, Grid elements, ClickController, cross-compilation, core 
-fixes 
+user-level elements, Grid elements, ClickController, cross-compilation, core
+fixes
+
+Cliff Frey
+cliff@meraki.com
+multithreading, continuing maintenance
 
 Thomer Gil
 thomer@lcs.mit.edu
@@ -25,7 +29,7 @@ jj@lcs.mit.edu
 initial design, Ethernet switch elements, user-level pcap/BPF elements
 
 Eddie Kohler
-kohler@cs.ucla.edu
+kohler@seas.harvard.edu
 design, core, language, Linux /proc interface, Linux kernel module,
 standard elements, tools, documentation, distribution, IP rewriting
 elements, ClickController, other elements, Tasks, Linux 2.4, Linux 2.6,
@@ -37,7 +41,7 @@ universal improvements, new elements
 
 Robert Morris
 rtm@lcs.mit.edu
-design, Ethernet, IP, Linux kernel module, radio elements, Linux kernel 
+design, Ethernet, IP, Linux kernel module, radio elements, Linux kernel
 patches, IP router configuration, element documentation, other elements
 
 Michael Neufeld