diff --git a/Makefile b/Makefile
index e6b4f425b..27760274f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # The last tagged version. Can be overridden either by the version from
 # git or from the value of the DIST_VERSION environment variable.
-VERSION	= 1.2.1
+VERSION	= 2.0
 
 all:
 
diff --git a/NEWS.adoc b/NEWS.adoc
index 789d915c7..de67bb141 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -1,8 +1,8 @@
 Release notes
 =============
 
-master
-------
+tig-2.0
+-------
 
 Note to packagers:
 
@@ -53,7 +53,7 @@ Improvements:
    view settings to configure the order and display options for each view
    columns. See system tigrc and tigrc(5) for examples. (GH #89, #222)
  - Add grep view as a front-end to git-grep(1): `tig grep -p strchr`. From
-   within Tig, the key for switching or grepping is bound to 'G' by default.
+   within Tig, the key for switching or grepping is bound to 'g' by default.
  - Rename 'branch' view to 'refs' view and show tags. (GH #134)
  - Add main view pager mode that reads git-log's '--pretty=raw' data
    from stdin, e.g. `git reflog --pretty=raw | tig --pretty=raw`.
diff --git a/doc/tigrc.5.adoc b/doc/tigrc.5.adoc
index f45511211..1a9c228c0 100644
--- a/doc/tigrc.5.adoc
+++ b/doc/tigrc.5.adoc
@@ -610,7 +610,7 @@ bind stage D :/^diff --(git|cc)
 
 bind main I :toggle show-id			# Show/hide the ID column
 bind diff D :toggle diff-options --minimal	# Use minimal diff algorithm
-bind diff [ :toggle diff-context -3		# Decrese context (-U arg)
+bind diff [ :toggle diff-context -3		# Decrease context (-U arg)
 bind diff ] :toggle diff-context +3		# Increase context
 bind generic V :toggle split-view-height -10%	# Decrease split height
 --------------------------------------------------------------------------
diff --git a/tools/aspell.dict b/tools/aspell.dict
index c4a6e0708..ad67a3146 100644
--- a/tools/aspell.dict
+++ b/tools/aspell.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 215 
+personal_ws-1.1 en 226 
 CJK
 del
 Ctrl
@@ -23,6 +23,7 @@ args
 asciidoc
 AsciiDoc
 unstanged
+gitattributes
 revgraph
 revargs
 topo
@@ -31,6 +32,7 @@ tmp
 cwd
 frontend
 boolean
+readline
 waddnstr
 config
 alloc
@@ -44,18 +46,21 @@ bgcolor
 env
 lrwxrwxrwx
 backend
-ESC
+Esc
 doctype
 gitlink
 colorN
 nowarn
 sys
+subshell
 tty
+cmdlineargs
 combi
 signoff
 utf
 Cogito
 keymap
+adoc
 Nano
 DSSL
 manpages
@@ -63,8 +68,10 @@ LDLIBS
 lookup
 stdout
 ncurses
+txt
 Makefile
 cacheinfo
+enum
 PgDown
 libexecdir
 bool
@@ -74,7 +81,6 @@ README
 submodules
 Reenable
 xhtml
-gitattributes
 aterm
 mkstemps
 iconv
@@ -83,22 +89,24 @@ Scrool
 ELinks
 subdir
 Debian
+subdirectories
 gui
 bindir
 tigmanual
+reachability
 PgUp
 wrt
 libiconv
 unicode
 multi
 Naïvely
-reachability
 autoconf
 xpm
 filesystem
 Fonseca
 tigrc
 ifdef
+printf
 XSL
 newwin
 charset
@@ -106,6 +114,7 @@ tigblob
 autobuild
 reflog
 diffargs
+commitencoding
 erasechar
 lds
 bg
@@ -141,12 +150,11 @@ Git's
 tig's
 dirs
 ld
+subdirectory
 newmode
 keymaps
 endif
 namespace
-commitencoding
-subdirectory
 utils
 delim
 unstaged
@@ -157,7 +165,7 @@ VLINE
 extdiff
 keybindings
 ifndef
-subdirectories
+multibyte
 COLORTERM
 ncursesw
 PDF
@@ -176,10 +184,13 @@ PID
 tz
 DocBook
 docbook
+submodule
 startup
 Yi
+docext
 renderer
 textconv
+strchr
 lineno
 repo
 NUL
@@ -190,11 +201,11 @@ Yy
 fgcolor
 localtime
 filename
+backgrounded
 lncursesw
 waitpid
 wgetch
 Pre
-backgrounded
 waddch
 subcommand
 errno