diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 92228f51f35f321bd68368c7853a20219dc810e0..84e4486dffed14ae6c96d1c06e56c7a84dad3fed 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.2.18 (April 12, 2020)
+
+### Fixes
+- task: `LocalSet` was incorrectly marked as `Send` (#2398)
+- io: correctly report `WriteZero` failure in `write_int` (#2334)
+
 # 0.2.17 (April 9, 2020)
 
 ### Fixes
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 3d075bbc2d59b7c12f896874b522b675ad1e80b2..a08fc942a6a1d0d14090f850a1a2e41f50526724 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -8,12 +8,12 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v0.2.x" git tag.
-version = "0.2.17"
+version = "0.2.18"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.17/tokio/"
+documentation = "https://docs.rs/tokio/0.2.18/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 9b1d6cdb01008d2350ac26a044b48f5064ad0153..8172f40a3bfb68c24807c887933305398b5c5d05 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio/0.2.17")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.18")]
 #![allow(
     clippy::cognitive_complexity,
     clippy::large_enum_variant,