diff --git a/CHANGELOG b/CHANGELOG
index 487d9bc18..e527138c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+3.0.7: 2020-08-29
+-----------------
+
+New features:
+- New "placeholder" parameter added to `PromptSession`.
+
+Other changes:
+- The "respond to CPR" logic has been moved from the `Input` to `Output`
+  classes (this does clean up some code).
+
+Fixes:
+- Bugfix in shift-selection key bindings.
+- Fix hight calculation of `FormattedTextControl` when line wrapping is turned
+  on.
+- Fixes for SSH server:
+  * Missing encoding property.
+  * Fix failure in "set_line_mode" call.
+  * Handle `BrokenPipeError`.
+
+
 3.0.6: 2020-08-10
 -----------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 91633fb42..c92ba8696 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.6'
+version = '3.0.7'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.6'
+release = '3.0.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/prompt_toolkit/__init__.py b/prompt_toolkit/__init__.py
index bcf107f44..fb840edf4 100644
--- a/prompt_toolkit/__init__.py
+++ b/prompt_toolkit/__init__.py
@@ -18,7 +18,7 @@
 from .shortcuts import PromptSession, print_formatted_text, prompt
 
 # Don't forget to update in `docs/conf.py`!
-__version__ = "3.0.6"
+__version__ = "3.0.7"
 
 # Version tuple.
 VERSION = tuple(__version__.split("."))