diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..360179caa
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,20 @@
+### HEAD
+
+The following are features that have been merged, but not yet deployed:
+
+- Nothing yet!
+
+### 1.9.5
+
+- Added changelog (#178)
+- Updated dependencies (#171, #172)
+- Speed up some queries by using UNION instead of JOIN (#170)
+- Improved etcd watch logic for ephemeral build system (#168)
+- Fixed CSS inconsistencies (#167, #160)
+- Removed dependency on user existance checks for auth implementations (#166)
+- Fixed issue where noisy build logs caused builds to timeout (#165)
+- Added scope descriptions to generate token page (#163)
+- Expose robots API via Swagger (#162)
+- Improved loading permissions by adding a short circuit (#154)
+- Improved coverage of handling builds with revoked OAuth credentials (#153)
+- Added ability to do manual builds of tags (#152)