diff --git a/build.gradle b/build.gradle
index 32c4e211e7..5bb44eaeb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ subprojects {
         // TODO: Unreleased dependencies.
         // These must already be installed in the local maven repository.
         netty: 'io.netty:netty-codec-http2:5.0.0.Alpha2-SNAPSHOT',
-        okhttp: 'com.squareup.okhttp:okhttp:2.2.0-SNAPSHOT',
+        okhttp: 'com.squareup.okhttp:okhttp:2.2.0',
 
         // Test dependencies.
         junit: 'junit:junit:4.11',
diff --git a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
index 334f4c902e..0681af167b 100644
--- a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
@@ -45,7 +45,7 @@ import com.squareup.okhttp.internal.spdy.ErrorCode;
 import com.squareup.okhttp.internal.spdy.FrameReader;
 import com.squareup.okhttp.internal.spdy.Header;
 import com.squareup.okhttp.internal.spdy.HeadersMode;
-import com.squareup.okhttp.internal.spdy.Http20Draft15;
+import com.squareup.okhttp.internal.spdy.Http20Draft16;
 import com.squareup.okhttp.internal.spdy.Settings;
 import com.squareup.okhttp.internal.spdy.Variant;
 
@@ -195,7 +195,7 @@ public class OkHttpClientTransport extends AbstractClientTransport {
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
-      Variant variant = new Http20Draft15();
+      Variant variant = new Http20Draft16();
       frameReader = variant.newReader(source, true);
       frameWriter = new AsyncFrameWriter(variant.newWriter(sink, true), this, executor);
       outboundFlow = new OutboundFlowController(this, frameWriter);
diff --git a/pom.xml b/pom.xml
index caca77bfc9..6ce36a28a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <okhttp.version>2.2.0-SNAPSHOT</okhttp.version>
+    <okhttp.version>2.2.0</okhttp.version>
     <netty.version>5.0.0.Alpha2-SNAPSHOT</netty.version>
     <jetty.alpn.version>8.0.0.v20140317</jetty.alpn.version>
     <jetty.alpn.path>