diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fbe9710a..930e3f635 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,38 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
 
 ## [Unreleased]
 
-- Expose `fs::create_dir_all`
+# [0.99.5] - 2019-09-12
+
+## Added
+
+- Added tests for `io::timeout`
+- Added `io::BufRead::fill_buf`, an `async fn` counterpart to `poll_fill_buf`
+- Added `fs::create_dir_all`
+- Added `future::timeout`, a free function to time out futures after a threshold
+- Added `io::prelude`
+- Added `net::ToSocketAddrs`, a non-blocking version of std's `ToSocketAddrs`
+- Added `stream::Stream::all`
+- Added `stream::Stream::filter_map`
+- Added `stream::Stream::find_map`
+- Added `stream::Stream::find`
+- Added `stream::Stream::min_by`
+- Added `stream::Stream::nth`
+
+## Changed
+
+- Polished the text and examples of the tutorial
+- `cargo fmt` on all examples
+- Simplified internals of `TcpStream::connect_to`
+- Modularized our CI setup, enabled a rustfmt fallback, and improved caching
+- Reduced our dependency on the `futures-rs` crate, improving compilation times
+- Split `io::Read`, `io::Write`, `io::BufRead`, and `stream::Stream` into
+  multiple files
+- `fs::File` now flushes more often to prevent flushes during `seek`
+- Updated all dependencies
+- Fixed a bug in the conversion of `File` into raw handle
+- Fixed compilation errors on the latest nightly
+
+## Removed
 
 # [0.99.4] - 2019-08-21
 
@@ -21,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
 
 - Initial beta release
 
-[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.99.3...HEAD
+[Unreleased]: https://github.com/async-rs/async-std/compare/v0.99.5...HEAD
+[0.99.5]: https://github.com/async-rs/async-std/compare/v0.99.4...v0.99.5
 [0.99.4]: https://github.com/async-rs/async-std/compare/v0.99.3...v0.99.4
 [0.99.3]: https://github.com/async-rs/async-std/tree/v0.99.3
diff --git a/Cargo.toml b/Cargo.toml
index ca0f3fc27..2d026fa49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "async-std"
-version = "0.99.4"
+version = "0.99.5"
 authors = [
   "Stjepan Glavina <stjepang@gmail.com>",
   "The async-std Project Developers",