diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eae5756cb..d5fc21e2d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,7 +47,6 @@ Alternatively, if your Camlistore root is checked out at
 $GOPATH/src/camlistore.org (optional, but natural for Go users), you
 can just:
 
-    $ export GO15VENDOREXPERIMENT=1  # required for all Camlistore builds
     $ go install ./dev/devcam
 
 The subcommands of devcam start the server or run camput/camget/etc:
@@ -101,7 +100,7 @@ in your commit message the version (e.g. git commit hash) of said third party.
 
 We follow the Go convention for commits (messages) about new Contributors.
 See https://golang.org/doc/contribute.html#copyright , and examples such as
-https://camlistore.org/gw/85bf99a7
+https://camlistore.org/gw/85bf99a7, and https://camlistore.org/gw/8f9af410.
 
 You can optionally use our pre-commit hook so that your code gets gofmt'ed
 before being submitted (which should be done anyway).
diff --git a/website/content/code.md b/website/content/code.md
index 23db8333e..cf3cce333 100644
--- a/website/content/code.md
+++ b/website/content/code.md
@@ -29,21 +29,23 @@ place to start.
     something similar or if there's a more Camlistore-like approach to
     the issue.
 
--   Submit your changes through the review process discussed below.
+-   Submit your changes to Gerrit through the review process discussed below.
 
--   Note that you'll need to agree to the appropriate Contributor
-    License Agreement:
+-   Note that before sending your first change for review (`devcam review`),
+    you'll need to agree to a [Contributor License Agreement](https://cla.developers.google.com).
 
-    -   [Individual Contributor License
-        Agreement](https://developers.google.com/open-source/cla/individual)
-
-    -   [Corporate Contributor License
-        Agreement](https://developers.google.com/open-source/cla/corporate)
-
-    These make lawyers feel all warm and cozy about open source. Be sure
-    to **email Brad or the list** when you've submitted one so it can be
-    processed and you'll be added to the CONTRIBUTORS file so your
-    patches can be reviewed and submitted.
+-   Once your first change has been accepted and merged, send a new change to
+    Gerrit, adding yourself to the
+    [AUTHORS](https://camlistore.googlesource.com/camlistore/+/master/AUTHORS)+[CONTRIBUTORS](https://camlistore.googlesource.com/camlistore/+/master/CONTRIBUTORS)
+    files (or just
+    [CONTRIBUTORS](https://camlistore.googlesource.com/camlistore/+/master/CONTRIBUTORS)
+    if the company which owns your Copyright is already in the
+    [AUTHORS](https://camlistore.googlesource.com/camlistore/+/master/AUTHORS)
+    file). We follow the
+    [Go convention](https://golang.org/doc/contribute.html#copyright)
+    for the commit messages; see for examples:
+    [85bf99a7](https://camlistore.org/gw/85bf99a7), and
+    [8f9af410](https://camlistore.org/gw/8f9af410).
 
 ### Code Review