diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 16a02c7c3..7b7176692 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,25 @@ Changelog
 
 kitty is a feature full, cross-platform, *fast*, GPU based terminal emulator.
 
+version 0.7.0 [future]
+---------------------------
+
+- Allow controlling kitty from the shell prompt/scripts. You can
+  open/close/rename windows and tabs and even send input to specific windows.
+  See the README for details.
+
+- Add option to override the default shell
+
+- Sessions: Allow setting titles and working directories for individual windows 
+
+- Fix incorrect reporting of mouse move events when using the SGR protocol
+
+- Make alt+backspace delete the previous word
+
+- Take the mouse wheel multiplier option in to account when generating fake key
+  scroll events
+
+
 version 0.6.1 [2017-12-28]
 ---------------------------
 
diff --git a/README.asciidoc b/README.asciidoc
index 84c6d03e6..09caf6caf 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -51,19 +51,21 @@ image::https://travis-ci.org/kovidgoyal/kitty.svg?branch=master[Build status, li
 
 == Major Features
 
-* Supports tiling multiple terminal windows side by side in different
-layouts without needing to use an extra program like tmux
+* Uses OpenGL for rendering, offloads rendering to the GPU for lower system
+load and buttery smooth scrolling. Uses threaded rendering to minimize input
+latency.
 
 * Supports all modern terminal features: graphics (images), unicode,
 true-color, OpenType ligatures, mouse protocol, focus tracking, bracketed paste and so on.
 
+* Supports tiling multiple terminal windows side by side in different
+layouts without needing to use an extra program like tmux
+
+* Can be controlled from scripts or the shell prompt, even over SSH.
+
 * Supports startup sessions which allow you to specify the window/tab layout,
 working directories and programs to run on startup.
 
-* Uses OpenGL for rendering, offloads rendering to the GPU for lower system
-load and buttery smooth scrolling. Uses threaded rendering to minimize input
-latency.
-
 * Cross-platform support: kitty currently works on Linux and macOS, but because
 it uses only OpenGL for rendering, it should be trivial to port to other
 platforms.
@@ -73,8 +75,6 @@ window using arbitrary programs of your choice. This is useful for browsing
 the history comfortably in a pager or editor and also for doing things like
 opening URLs using only the keyboard.
 
-* Easily hackable (UI layer written in python, inner loops in C for
-speed). Less than fifteen thousand lines of code.
 
 image::screenshot.png?raw=true[Screenshot, showing three programs in the "Tall" layout]