diff --git a/Documentation/user-search.txt b/Documentation/user-search.txt
index cd79812b06..0c6abb8dd1 100644
--- a/Documentation/user-search.txt
+++ b/Documentation/user-search.txt
@@ -378,20 +378,20 @@ Scores of +2 are not matched, even though they are higher.
 +
 Matches changes with either a +1, +2, or any higher score.
 
-`label:CodeReview=+2,aname`::
+`label:Code-Review=+2,aname`::
 +
 Matches changes with a +2 code review where the reviewer or group is aname.
 
-`label:CodeReview=2,user=jsmith`::
+`label:Code-Review=2,user=jsmith`::
 +
 Matches changes with a +2 code review where the reviewer is jsmith.
 
-`label:CodeReview=+1,group=ldap/linux.workflow`::
+`label:Code-Review=+1,group=ldap/linux.workflow`::
 +
 Matches changes with a +1 code review where the reviewer is in the
 ldap/linux.workflow group.
 
-`label:CodeReview<=-1`::
+`label:Code-Review<=-1`::
 +
 Matches changes with either a -1, -2, or any lower score.
 
diff --git a/ReleaseNotes/ReleaseNotes-2.8.1.txt b/ReleaseNotes/ReleaseNotes-2.8.1.txt
index 13762e31d9..b155f80e4b 100644
--- a/ReleaseNotes/ReleaseNotes-2.8.1.txt
+++ b/ReleaseNotes/ReleaseNotes-2.8.1.txt
@@ -12,8 +12,12 @@ Changes that depend on outdated patch sets were missing in the related changes l
 +
 After rebasing the first change the other changes disappeared from the related changes list.
 
-* Fix plugin API packaging. Parts from JGit signed library were included in the
-plugin API. As a consequence unit tests were failing to execute against it.
+* Don't list the same change twice in related changes.
+
+* Fix plugin API packaging.
++
+Parts from JGit's signed library were included in the plugin API. As a consequence unit
+tests were failing to execute against it.
 
 * Fix IllegalArgumentException in task queue comparator.
 +
@@ -28,4 +32,16 @@ This fixes a bug that prevented javamelody from working properly.
 +
 This happened if a new patch set was given for an initial commit in a repository.
 
-* Enable syntax highlighting for CXX, HXX, Python, Go, BUCK and .gitmodules.
+* link:https://code.google.com/p/gerrit/issues/detail?id=2320[Issue 2320],
+link:https://code.google.com/p/gerrit/issues/detail?id=2360[Issue 2360]:
+Enable syntax highlighting for CXX, HXX, Python, Go, Scala, BUCK and .gitmodules.
+
+* Preserve SNAPSHOT suffix in Maven artifact names.
++
+The SNAPSHOT suffix was being removed, which prevented Buck from
+downloading the Gitblit plugin's custom artifacts from the Gerritforge
+repository.
+
+* Always show repo download command if repo download scheme is enabled.
+
+* Minor fixes in the documentation.
diff --git a/VERSION b/VERSION
index 6a132bb5e2..f0594c4457 100644
--- a/VERSION
+++ b/VERSION
@@ -3,3 +3,4 @@
 # when talking to the destination repository.
 #
 GERRIT_VERSION = '2.9-SNAPSHOT'
+