diff --git a/README.md b/README.md
index a6981c3e8df2..114fee862c4f 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,10 @@ Guava comes in two flavors.
 
 ## Latest release
 
-The most recent release is [Guava 23.5][current release], released 2017-11-22.
+The most recent release is [Guava 23.6][current release], released 2017-12-20.
 
 The Maven group ID is `com.google.guava`, and the artifact ID is `guava`. Use
-version `23.5-jre` for the JRE flavor, or `23.5-android` for the Android flavor.
+version `23.6-jre` for the JRE flavor, or `23.6-android` for the Android flavor.
 
 To add a dependency on Guava using Maven, use the following:
 
@@ -29,9 +29,9 @@ To add a dependency on Guava using Maven, use the following:
 <dependency>
   <groupId>com.google.guava</groupId>
   <artifactId>guava</artifactId>
-  <version>23.5-jre</version>
+  <version>23.6-jre</version>
   <!-- or, for Android: -->
-  <version>23.5-android</version>
+  <version>23.6-android</version>
 </dependency>
 ```
 
@@ -39,9 +39,9 @@ To add a dependency using Gradle:
 
 ```
 dependencies {
-  compile 'com.google.guava:guava:23.5-jre'
+  compile 'com.google.guava:guava:23.6-jre'
   // or, for Android:
-  compile 'com.google.guava:guava:23.5-android'
+  compile 'com.google.guava:guava:23.6-android'
 }
 ```
 
@@ -96,7 +96,7 @@ Linux. Some features, especially in `com.google.common.io`, may not work
 correctly in other environments. For the Android flavor, our unit tests run on
 API level 15 (Ice Cream Sandwich).
 
-[current release]: https://github.com/google/guava/releases/tag/v23.5
+[current release]: https://github.com/google/guava/releases/tag/v23.6
 [guava-snapshot-api-docs]: http://google.github.io/guava/releases/snapshot-jre/api/docs/
 [guava-snapshot-api-diffs]: http://google.github.io/guava/releases/snapshot-jre/api/diffs/
 [Guava Explained]: https://github.com/google/guava/wiki/Home
diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java
index e2cf555012b9..a9ef5b8b66fa 100755
--- a/android/guava/src/com/google/common/net/HttpHeaders.java
+++ b/android/guava/src/com/google/common/net/HttpHeaders.java
@@ -259,7 +259,7 @@ private ReferrerPolicyValues() {}
    * The HTTP <a href="https://www.w3.org/TR/server-timing/">{@code Server-Timing}</a> header field
    * name.
    *
-   * @since NEXT
+   * @since 23.6
    */
   public static final String SERVER_TIMING = "Server-Timing";
   /**
diff --git a/android/guava/src/com/google/common/util/concurrent/Futures.java b/android/guava/src/com/google/common/util/concurrent/Futures.java
index 53132d26ff24..97c67d3aef69 100644
--- a/android/guava/src/com/google/common/util/concurrent/Futures.java
+++ b/android/guava/src/com/google/common/util/concurrent/Futures.java
@@ -1017,7 +1017,7 @@ public <C> ListenableFuture<C> call(Callable<C> combiner) {
      *
      * <p>Canceling this Future will attempt to cancel all the component futures.
      *
-     * @since NEXT
+     * @since 23.6
      */
     public ListenableFuture<?> run(final Runnable combiner, Executor executor) {
       return call(
diff --git a/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java b/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
index 9f332a20820a..fd082649be32 100644
--- a/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
+++ b/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
@@ -98,7 +98,7 @@ public static boolean awaitUninterruptibly(CountDownLatch latch, long timeout, T
    * Invokes {@code condition.}{@link Condition#await(long, TimeUnit) await(timeout, unit)}
    * uninterruptibly.
    *
-   * @since NEXT
+   * @since 23.6
    */
   @GwtIncompatible // concurrency
   public static boolean awaitUninterruptibly(Condition condition, long timeout, TimeUnit unit) {
diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java
index e2cf555012b9..a9ef5b8b66fa 100644
--- a/guava/src/com/google/common/net/HttpHeaders.java
+++ b/guava/src/com/google/common/net/HttpHeaders.java
@@ -259,7 +259,7 @@ private ReferrerPolicyValues() {}
    * The HTTP <a href="https://www.w3.org/TR/server-timing/">{@code Server-Timing}</a> header field
    * name.
    *
-   * @since NEXT
+   * @since 23.6
    */
   public static final String SERVER_TIMING = "Server-Timing";
   /**
diff --git a/guava/src/com/google/common/util/concurrent/Futures.java b/guava/src/com/google/common/util/concurrent/Futures.java
index 53132d26ff24..97c67d3aef69 100644
--- a/guava/src/com/google/common/util/concurrent/Futures.java
+++ b/guava/src/com/google/common/util/concurrent/Futures.java
@@ -1017,7 +1017,7 @@ public <C> ListenableFuture<C> call(Callable<C> combiner) {
      *
      * <p>Canceling this Future will attempt to cancel all the component futures.
      *
-     * @since NEXT
+     * @since 23.6
      */
     public ListenableFuture<?> run(final Runnable combiner, Executor executor) {
       return call(
diff --git a/guava/src/com/google/common/util/concurrent/Uninterruptibles.java b/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
index 9f332a20820a..fd082649be32 100644
--- a/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
+++ b/guava/src/com/google/common/util/concurrent/Uninterruptibles.java
@@ -98,7 +98,7 @@ public static boolean awaitUninterruptibly(CountDownLatch latch, long timeout, T
    * Invokes {@code condition.}{@link Condition#await(long, TimeUnit) await(timeout, unit)}
    * uninterruptibly.
    *
-   * @since NEXT
+   * @since 23.6
    */
   @GwtIncompatible // concurrency
   public static boolean awaitUninterruptibly(Condition condition, long timeout, TimeUnit unit) {