diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f26ee..7b4a35a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,41 @@
 CHANGELOG
 =========
 
-0.21.0 (WIP)
-------------
+0.21.0
+------
+- `--height` option is now available on Windows as well (@kelleyma49)
+- Added `--pointer` and `--marker` options
+- Added `--keep-right` option that keeps the right end of the line visible
+  when it's too long
 - Style changes
-    - Unicode spinner
     - `--border` will now print border with rounded corners around the
       finder instead of printing horizontal lines above and below it.
       The previous style is available via `--border=horizontal`
-- Added `--pointer` and `--marker` options
-- `--height` option is now available on Windows binary (@kelleyma49)
+    - Unicode spinner
 - More keys and actions for `--bind`
-- Added `--keep-right` option that keeps the right end of the line visible
-  when it's too long
-- Bug fixes and improvements
-- Vim plugin: Floating windows support
+- Added PowerShell script for downloading Windows binary
+- Vim plugin: Built-in floating windows support
+  ```vim
+  let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } }
+  ```
 - bash: Various improvements in key bindings (CTRL-T, CTRL-R, ALT-C)
+    - CTRL-R will start with the current command-line as the initial query
+    - CTRL-R properly supports multi-line commands
 - Fuzzy completion API changed
   ```sh
   # Previous: fzf arguments given as a single string argument
-  # - This style is still supported, but it is deprecated
+  # - This style is still supported, but it's deprecated
   _fzf_complete "--multi --reverse --prompt=\"doge> \"" "$@" < <(
     echo foo
   )
 
   # New API: multiple fzf arguments before "--"
-  # - More rebust and easier to write options
+  # - Easier to write multiple options
   _fzf_complete --multi --reverse --prompt="doge> " -- "$@" < <(
     echo foo
   )
   ```
+- Bug fixes and improvements
 
 0.20.0
 ------
diff --git a/install b/install
index 6451926..2a79a91 100755
--- a/install
+++ b/install
@@ -2,7 +2,7 @@
 
 set -u
 
-version=0.20.0
+version=0.21.0
 auto_completion=
 key_bindings=
 update_config=2
diff --git a/install.ps1 b/install.ps1
index 46bd940..25e0dc6 100644
--- a/install.ps1
+++ b/install.ps1
@@ -1,4 +1,4 @@
-$version="0.20.0"
+$version="0.21.0"
 
 if ([Environment]::Is64BitProcess) {
   $binary_arch="amd64"
diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1
index 8bb098b..1f47134 100644
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf-tmux 1 "Dec 2019" "fzf 0.20.0" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Mar 2020" "fzf 0.21.0" "fzf-tmux - open fzf in tmux split pane"
 
 .SH NAME
 fzf-tmux - open fzf in tmux split pane
diff --git a/src/constants.go b/src/constants.go
index 9c635ea..3231482 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	// Current version
-	version = "0.20.0"
+	version = "0.21.0"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond