diff --git a/AUTHORS b/AUTHORS
index 23bc44dea77e9f6696b3db1fbb8751dd5fc57819..7e2bbc50098e113b5fc0895b2f6fcd9187f4fb0b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ thread, device driver updates
 
 Douglas S. J. DeCouto
 decouto@lcs.mit.edu
-user level elements, Grid elements, ControlSocket Java programs
+user-level elements, Grid elements, ControlSocket Java programs
 
 Peilei Fan
 peilei@mit.edu
@@ -19,7 +19,11 @@ Eddie Kohler
 eddietwo@lcs.mit.edu
 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
+elements, global element updates, other elements
+
+Mazu Networks, Inc.
+http://www.mazunetworks.com/
+universal improvements, new elements
 
 Robert Morris
 rtm@lcs.mit.edu
diff --git a/FAQ b/FAQ
index ccdde7e01735e3eb5df083f47ed3279387f6faed..4db987052867c0e2e2721ebb99f92ab030c3469b 100644
--- a/FAQ
+++ b/FAQ
@@ -12,7 +12,7 @@ A. Yes.
 Q. The Click Linux patch does not apply cleanly.
 
 A. You need a specific version of Linux. The patch we are distributing (as
-   of version 1.0) is for Linux 2.2.14. Most of the patch will apply no
+   of version 1.1) is for Linux 2.2.16. Most of the patch will apply no
    matter what version of Linux 2.2 you use. The problem is the Tulip
    device driver, which seems to be changing a lot between versions.
 
diff --git a/README b/README
index 2e683ba9aa11b31c25a8f66521ec5c817e454d31..e27894e451376f37192e073841d28aab5b0faff5 100644
--- a/README
+++ b/README
@@ -76,9 +76,9 @@ User-Level Program
 
     Run the user-level program by giving it the name of a configuration
 file: `click CONFIGFILE'. If you have compiled Click with pcap support,
-you'll want to use the FromBPF, ToBPF, FromDump, and ToDump elements. You
-can still play around with Click even without pcap support: check out the
-InfiniteSource and TimedSource elements, or write your own
+you'll want to use the FromDevice, ToDevice, FromDump, and ToDump elements.
+You can still play around with Click even without pcap support: check out
+the InfiniteSource and TimedSource elements, or write your own
 packet-generation element.
 
 Linux Kernel Module
@@ -86,21 +86,24 @@ Linux Kernel Module
 
     See the `doc/click.o.8' manual page for a detailed description. To
 summarize, install a configuration by running `click-install CONFIGFILE'.
-This will also install the kernel module, if necessary. (But you must run
-`make install' before `click-install' will work.) You can also install the
-kernel module with `/sbin/insmod click.o', and then install a configuration
-by hand with `cat CONFIGFILE > /proc/click/config'. If any errors occurred,
-they will appear in `/proc/click/errors'.
+This will also install the kernel module if necessary and report any errors
+to standard error. (You must run `make install' before `click-install' will
+work.)
+
+    You can also install the kernel module with `/sbin/insmod click.o', and
+then install a configuration by hand with `cat CONFIGFILE >
+/proc/click/config'. If any errors occurred, they will appear in
+`/proc/click/errors'. But `click-install' is easier.
 
 Configurations
 --------------
 
     A few configurations are included in the `conf' directory, including a
-Perl script that generated the IP router configurations used in our SOSP
-paper (`conf/make-ip-conf.pl') and a set of patterns for the Click
-optimizer (`conf/ip.clickpat'). The configurations are presently un- or
-under-documented. Please check back to our Web site for more up-to-date
-configurations.
+Perl script that generated the IP router configurations used in our TOCS
+paper (`conf/make-ip-conf.pl') and a set of patterns for the Click pattern
+optimizer, click-xform (`conf/ip.clickpat'). The configurations are
+presently un- or under-documented. Please check back to our Web site for
+more up-to-date configurations.
 
 COPYRIGHT AND LICENSE
 =====================
@@ -119,9 +122,10 @@ us at
 
 	- The Click software team:
 	  Eddie Kohler
-	  Robert Morris
 	  Benjie Chen
-	  Max Poletto
+	  Douglas S. J. DeCouto
+	  Peilei Fan
 	  Thomer M. Gil
-	  John Jannotti
+	  Robert Morris
+	  Max Poletto
 	  M. Frans Kaashoek