diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cfdd65f0f..084f33fa2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,38 @@ Changelog
 
 kitty is a feature full, cross-platform, *fast*, GPU based terminal emulator.
 
+version 0.9.0 [future]
+------------------------
+
+- A new kitty command shell to allow controlling kitty via commands. Press
+  ctrl+shift+escape to run the shell.
+
+- Linux: Switch to libxkbcommon for keyboard handling. It allows kitty to
+  support XCompose and dead keys and also react to keyboard remapping/layout
+  change without needing a restart.
+
+- Add support for multiple-key shortcuts
+
+- A new remote control command "set-colors" to change the current and/or
+  configured colors.
+
+- Add an "include" directive for the config files to read multiple config files
+
+- Improve mouse selection for windows with padding. Moving the mouse into the
+  padding area now acts as if the mouse is over the nearest cell.
+
+- Allow setting all 256 terminal colors in the config file
+
+- Fix using kitty --single-instance to open a new window in a running kitty
+  instance, not respecting the --directory flag
+
+- URL hints: Exclude trailing punctuation from URLs
+
+- URL hints: Launch the browser from the kitty parent process rather than the
+  hints kitten. Fixes launching on some systems where xdg-open doesn't like
+  being run from a kitten.
+
+
 version 0.8.4 [2018-03-31]
 -----------------------------