diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
index abf3b675fdebf145c72c50cc12ea7fabfb8dc6c6..a5a1d4e23e2c7bd7715840f97122a3c68fce79ef 100644
--- a/Documentation/RelNotes/1.8.2.txt
+++ b/Documentation/RelNotes/1.8.2.txt
@@ -95,6 +95,10 @@ UI, Workflows & Features
  * "git commit" can be told to use --cleanup=whitespace by setting the
    configuration variable commit.cleanup to 'whitespace'.
 
+ * "git diff" and other Porcelain commands can be told to use a
+   non-standard algorithm by setting diff.algorithm configuration
+   variable.
+
  * "git fetch --mirror" and fetch that uses other forms of refspec
    with wildcard used to attempt to update a symbolic ref that match
    the wildcard on the receiving end, which made little sense (the
@@ -118,6 +122,10 @@ UI, Workflows & Features
  * "git log --cc --graph" now shows the combined diff output with the
    ancestry graph.
 
+ * "git log --grep=<pattern>" honors i18n.logoutputencoding to look
+   for the pattern after fixing the log message to the specified
+   encoding.
+
  * "git mergetool" and "git difftool" learned to list the available
    tool backends in a more consistent manner.
 
@@ -154,6 +162,11 @@ UI, Workflows & Features
    tip of the remote branch (as opposed to integrating with the commit
    recorded in the superproject's gitlink).
 
+ * "git upload-pack" which implements the service "ls-remote" and
+   "fetch" talk to can be told to hide ref hierarchies the server
+   side internally uses (and that clients have no business learning
+   about) with transfer.hiderefs configuration.
+
 
 Foreign Interface
 
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e9f7abca91b96c2f9c99744c49adefe04a4daf56..4448c35bd054927aa69340c6272c32f858835838 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.1.GIT
+DEF_VER=v1.8.2-rc0
 
 LF='
 '