diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e5a9cf95..0acd93a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,24 @@
 # Changelog
 
-## Version [Unreleased]
+## Version 3.1.0
+
+- Add `Server::poll_timeout()` for polling more efficiently.
+- Add `Server::stoppable()` for running a single, cancellable server thread.
+- Add `Server::join()` for finalising all in-flight requests before shutting down.
+- [Prevent infinite loop on Websocket EOF](https://github.com/tomaka/rouille/pull/212)
+- Update `tiny-http` to 0.8.1 containing fixes for:
+  - HTTPS deadlock where one request holds a locked resource while another is
+    attempting HTTPS negotiation
+  - Fix [RUSTSEC-2020-0031](https://rustsec.org/advisories/RUSTSEC-2020-0031.html)
+  - Don't set `Transfer-Encoding: chunked` on 1xx or 204 responses (which can lead
+    to clients hanging).
+- Bump minimum support Rust version to 1.41.1
+
+## Version 3.0.0
+
 - Bump minimum supported Rust version to 1.34.2
 - embedded, exposed `url` version increased to 2.0
+- Don't use deprecated `Error::description()`
 
 ## Version 2.2.0
 
diff --git a/Cargo.toml b/Cargo.toml
index 439c72196..81eae02d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rouille"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/tomaka/rouille"
@@ -31,7 +31,7 @@ serde_json = "1"
 sha1 = "0.6.0"
 term = "0.5.1"
 time = "0.1.31"
-tiny_http = "0.6.0"
+tiny_http = "0.8.1"
 url = "2"
 threadpool = "1"
 num_cpus = "1"