diff --git a/AUTHORS b/AUTHORS
index ef2d3d1552df2828da1836be7db023fc1282bbd7..23bc44dea77e9f6696b3db1fbb8751dd5fc57819 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,20 +5,21 @@ thread, device driver updates
 
 Douglas S. J. DeCouto
 decouto@lcs.mit.edu
-user level elements
+user level elements, Grid elements, ControlSocket Java programs
+
+Peilei Fan
+peilei@mit.edu
+IPv6 elements
 
 Thomer Gil
 thomer@lcs.mit.edu
-dynamic IP routing table
-
-John Jannotti
-jj@lcs.mit.edu
-design, Ethernet switch elements, user-level pcap/BPF elements
+dynamic IP routing table, IP rate monitoring elements
 
 Eddie Kohler
 eddietwo@lcs.mit.edu
-design, core, Linux /proc interface, standard elements, tools, documentation, 
-distribution, other elements
+design, core, language, Linux /proc interface, Linux kernel module,
+standard elements, tools, documentation, distribution, IP rewriting
+elements, Ethernet, IP, and userlevel element updates, other elements
 
 Robert Morris
 rtm@lcs.mit.edu
@@ -29,13 +30,13 @@ Massimiliano Poletto
 maxp@lcs.mit.edu
 IP rewriting elements, stride scheduling element, round robin scheduler
 
-Alex Snoeren
-snoeren@lcs.mit.edu
-IP security elements
-
 
 Thanks to:
 
+John Jannotti
+jj@lcs.mit.edu
+initial design work, Ethernet switch elements, user-level pcap/BPF elements
+
 M. Frans Kaashoek
 kaashoek@lcs.mit.edu
 initial design work
diff --git a/README b/README
index 5de8e9017b15d2b7bd2ff5d83064c8145b808f07..2e683ba9aa11b31c25a8f66521ec5c817e454d31 100644
--- a/README
+++ b/README
@@ -9,9 +9,10 @@ information on the Web at
 
     Click is a modular router toolkit. To use it you'll need to know how to
 compile and install the software, how to write router configurations, and
-how to write new elements. Our SOSP 1999 paper (available from the Web
-site) will give you a feeling for what Click can do. (Note: Our performance
-has improved about sixfold since that paper.)
+how to write new elements. Our ACM Transactions on Computer Systems paper
+(available from the Web site) will give you a feeling for what Click can
+do. (Note: Using the optimization tools under CLICKDIR/tools, you can get
+even better performance than that paper describes.)
 
 CONTENTS
 --------