diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..b48ebcb
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,28 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Added
+
+### Changed
+
+### Removed
+
+## [2.2.0] - 2020-07-27
+### Added
+
+ - Changelog
+ - STARTTLS example (#165)
+ - Timeout example (#168)
+ - Export `Result` and `Error` types (#170)
+
+### Changed
+
+ - MSRV increased
+ - Better documentation of server greeting handling (#168)
+
+[Unreleased]: https://github.com/jonhoo/rust-imap/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/jonhoo/rust-imap/compare/v2.1.2...v2.2.0
diff --git a/Cargo.toml b/Cargo.toml
index d7172e4..a4e8976 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "2.1.2"
+version = "2.2.0"
 authors = ["Matt McCoy <mattnenterprise@yahoo.com>",
            "Jon Gjengset <jon@thesquareplanet.com>"]
 documentation = "https://docs.rs/imap/"