diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 0000000..b7c99c8
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,26 @@
+Unreleased
+--------------
+
+- httpaf-lwt, httpaf-lwt-unix, httpaf-mirage: deduplicate interface code via a
+  common `Httpaf_lwt_intf` interface
+  ([#13](https://github.com/anmonteiro/httpaf/pull/13))
+- httpaf, httpaf-lwt, httpaf-lwt-unix, httpaf-async, httpaf-mirage: add support
+  for persistent connections and pipelining in the client implementations
+  ([#5](https://github.com/anmonteiro/httpaf/pull/5))
+- httpaf, httpaf-lwt, httpaf-lwt-unix, httpaf-async, httpaf-mirage: add support
+  for switching protocols, e.g. to a WebSocket connection, via a new function
+  `Reqd.respond_with_upgrade`
+  ([#8](https://github.com/anmonteiro/httpaf/pull/8))
+- httpaf-lwt-unix: add support for HTTPS in the Lwt runtime, either via OpenSSL
+  or `ocaml-tls` ([#2](https://github.com/anmonteiro/httpaf/pull/2))
+- httpaf, httpaf-lwt, httpaf-lwt-unix, httpaf-mirage: Add a Mirage adapter
+  ([#3](https://github.com/anmonteiro/httpaf/pull/3))
+- Add an `esy.json` file ([#6](https://github.com/anmonteiro/httpaf/pull/6))
+- httpaf: Catch parsing errors and hand them to `error_handler` in
+  `Server_connection` ([#4](https://github.com/anmonteiro/httpaf/pull/4))
+
+httpaf (upstream) 0.6.0
+--------------
+
+- Initial fork point
+  [025f5bc](https://github.com/anmonteiro/httpaf/commit/025f5bc94a48a7aa1c2dee4fd6e5667c0268d2a7)
diff --git a/README.md b/README.md
index 15f92a5..066caf1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+_This work builds on top of httpaf by providing more features than the original
+work, as well as fixing some bugs in the original implementation. For a full
+list of changes and additions, please refer to [CHANGES.md](./CHANGES.md)._
+
 # http/af
 
 http/af is a high-performance, memory-efficient, and scalable web server for