diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5762635dfa1489bf7fca25cec2d17decdfd5d81f..9d7154cc73c22dc766cd2ba3e13d0841896ea23d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+Version 2.6.4 *(2020-01-02)*
+----------------------------
+
+ * Fix: Support 'suspend' functions in services interfaces when using 'retrofit-mock' artifact.
+
+
 Version 2.6.3 *(2019-12-09)*
 ----------------------------
 
diff --git a/README.md b/README.md
index 9588e82b5554ccac725877781ff26c57b4b66966..f2e84ca25b6268979278a060dcdd61795a13cf12 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ For more information please see [the website][1].
 Download
 --------
 
-Download [the latest JAR][2] or grab from Maven central at the coordinates `com.squareup.retrofit2:retrofit:2.6.3`.
+Download [the latest JAR][2] or grab from Maven central at the coordinates `com.squareup.retrofit2:retrofit:2.6.4`.
 
 Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap].
 
diff --git a/pom.xml b/pom.xml
index 29c769e3480c701d1acbf99b5529072406fe3922..49263c4c8944fce52727b520337f084cc044c684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>com.squareup.retrofit2</groupId>
   <artifactId>parent</artifactId>
-  <version>2.6.4-SNAPSHOT</version>
+  <version>2.6.4</version>
   <packaging>pom</packaging>
 
   <name>Retrofit (Parent)</name>
diff --git a/retrofit-adapters/guava/pom.xml b/retrofit-adapters/guava/pom.xml
index ff1b4d47844bf803baad7070e6bb23e40cf01b7f..aefd0db0cfb8aa83dd2d395c7aa9578f92d33e0b 100644
--- a/retrofit-adapters/guava/pom.xml
+++ b/retrofit-adapters/guava/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-adapters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-adapters/java8/pom.xml b/retrofit-adapters/java8/pom.xml
index 51a120b6e7f801cd88d2c8278495df73fd70228c..a676e5beba169ecfd2203a6e85a27eafe664dc6c 100644
--- a/retrofit-adapters/java8/pom.xml
+++ b/retrofit-adapters/java8/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-adapters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-adapters/pom.xml b/retrofit-adapters/pom.xml
index 578f566824156d5be0895c08030c4061e2735ccf..984719ce65a5d76839f3eeaaf958ae2b23fbb855 100644
--- a/retrofit-adapters/pom.xml
+++ b/retrofit-adapters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>parent</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-adapters/rxjava/pom.xml b/retrofit-adapters/rxjava/pom.xml
index 26de6d6297c168b695dd6ef952a8580d0ddcdc29..d61723cc65a72b8147db243ccbbf2ab508752edb 100644
--- a/retrofit-adapters/rxjava/pom.xml
+++ b/retrofit-adapters/rxjava/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-adapters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-adapters/rxjava2/pom.xml b/retrofit-adapters/rxjava2/pom.xml
index 2f38843d8caac9f022cdbdef29d363714581a5b9..ab7184882a659042d631a5483311f455c8856250 100644
--- a/retrofit-adapters/rxjava2/pom.xml
+++ b/retrofit-adapters/rxjava2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-adapters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-adapters/scala/pom.xml b/retrofit-adapters/scala/pom.xml
index 96c522e1d8b236d9a412f5262b4dd29beced0936..f2fc0c591bcb2f982f3adf06fcaaea6ad86d7f88 100644
--- a/retrofit-adapters/scala/pom.xml
+++ b/retrofit-adapters/scala/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-adapters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/gson/pom.xml b/retrofit-converters/gson/pom.xml
index f7677ee5d17aa9419d1107e2138200e1572ecd3e..08643c846e6fcb3f347c15dd2e2a13b881e27339 100644
--- a/retrofit-converters/gson/pom.xml
+++ b/retrofit-converters/gson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/guava/pom.xml b/retrofit-converters/guava/pom.xml
index 2105211a66603373ad14d3acb9e03129ccea4605..4f26046cba791d7e6c76c081fb95fdb91252d047 100644
--- a/retrofit-converters/guava/pom.xml
+++ b/retrofit-converters/guava/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/jackson/pom.xml b/retrofit-converters/jackson/pom.xml
index ec1b3b569bf3d53daaa23a1bd3facd4c9bf3c636..174939b84b2e5b12a050d94d091f0f840b14c794 100644
--- a/retrofit-converters/jackson/pom.xml
+++ b/retrofit-converters/jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/java8/pom.xml b/retrofit-converters/java8/pom.xml
index 6e7f1536d34917f93883e6499679ff122c17d6b2..331d1b419843dc160d90fbe1390c517a870b7f06 100644
--- a/retrofit-converters/java8/pom.xml
+++ b/retrofit-converters/java8/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/jaxb/pom.xml b/retrofit-converters/jaxb/pom.xml
index 1a295ce19b56295334a830ae1ef64c9516093f31..8bd68ee23afb40abc6fb6783037e04810ba7926d 100644
--- a/retrofit-converters/jaxb/pom.xml
+++ b/retrofit-converters/jaxb/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/moshi/pom.xml b/retrofit-converters/moshi/pom.xml
index ea139575185cbb20232e4aa85a6a311070478304..8c73800d35d980ba70e800a5770cb0038a6e4086 100644
--- a/retrofit-converters/moshi/pom.xml
+++ b/retrofit-converters/moshi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/pom.xml b/retrofit-converters/pom.xml
index f995351171d655cb122ab34bafb5300062f2c9d5..82ef5cf05db510ea451952aad5fb0ac4e82cf4b8 100644
--- a/retrofit-converters/pom.xml
+++ b/retrofit-converters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>parent</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/protobuf/pom.xml b/retrofit-converters/protobuf/pom.xml
index 91dac3e37753d7c75958c43af410c396e09515e4..1b41abf2945a03651bdcbeec42949bf05bc09844 100644
--- a/retrofit-converters/protobuf/pom.xml
+++ b/retrofit-converters/protobuf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/scalars/pom.xml b/retrofit-converters/scalars/pom.xml
index 522ff19b4254be60a6db58545cc9d9609c8415c2..4da730c4b38afb643df7468a4d016afdef72e29b 100644
--- a/retrofit-converters/scalars/pom.xml
+++ b/retrofit-converters/scalars/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/simplexml/pom.xml b/retrofit-converters/simplexml/pom.xml
index 2010dc6665c856d0a7621b0edd4a0b2b6f8fd30a..3e2aab2158cafbf7b912be3b74e075e8c8970117 100644
--- a/retrofit-converters/simplexml/pom.xml
+++ b/retrofit-converters/simplexml/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-converters/wire/pom.xml b/retrofit-converters/wire/pom.xml
index 2a53dc93322517d1d6b3eef6cb18b93da1750352..c36f7793c19e54d061c53b53bf82e3560d0a6aa7 100644
--- a/retrofit-converters/wire/pom.xml
+++ b/retrofit-converters/wire/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>retrofit-converters</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit-mock/pom.xml b/retrofit-mock/pom.xml
index 29c5a64538dea17ebff9375bc76d2abf65e41f73..e39c7f5689dcea4a040e51968f0d81a28a1f6a55 100644
--- a/retrofit-mock/pom.xml
+++ b/retrofit-mock/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>parent</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/retrofit/pom.xml b/retrofit/pom.xml
index 24319ff6a7f7ddf3c89579e38649a82d5dbfce96..b0568bb915f2855769746320cf21ac37ecf6a3bf 100644
--- a/retrofit/pom.xml
+++ b/retrofit/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>parent</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/samples/pom.xml b/samples/pom.xml
index 3fb98af75d6db4d50aa86c84f6bd063dea25c95e..b9a7cf167ee2c6b9c8f55f3181f16401abdca44d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.squareup.retrofit2</groupId>
     <artifactId>parent</artifactId>
-    <version>2.6.4-SNAPSHOT</version>
+    <version>2.6.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>