diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 192698c7822..a77f53abeee 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.6.4 (July 19, 2021)
+
+Fixes a missed edge case from 1.6.3.
+
+### Fixed
+
+- runtime: drop canceled future on next poll (#3965)
+
 # 1.6.3 (July 6, 2021)
 
 Forward ports 1.5.1 fixes.
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 953109f27ba..1ab595d2651 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -7,12 +7,12 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v1.0.x" git tag.
-version = "1.6.3"
+version = "1.6.4"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/1.6.3/tokio/"
+documentation = "https://docs.rs/tokio/1.6.4/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """