diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 2be25bf..3f37085 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -4,7 +4,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.1
+" Version:     2.2
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
@@ -24,11 +24,6 @@ scriptencoding utf-8
 
 " Basic init {{{2
 
-if v:version < 700
-    echomsg 'Tagbar: Vim version is too old, Tagbar requires at least 7.0'
-    finish
-endif
-
 if !exists('g:tagbar_ctags_bin')
     if executable('ctags-exuberant')
         let g:tagbar_ctags_bin = 'ctags-exuberant'
diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index 57866ce..92d9d4a 100644
--- a/doc/tagbar.txt
+++ b/doc/tagbar.txt
@@ -3,7 +3,7 @@
 Author:		Jan Larres <jan@majutsushi.net>
 Licence:	Vim licence, see |license|
 Homepage:	http://majutsushi.github.com/tagbar/
-Version:	2.1
+Version:	2.2
 
 ==============================================================================
 Contents					*tagbar* *tagbar-contents*
@@ -874,6 +874,23 @@ value here instead of simply "ctags".
 ==============================================================================
 8. History						*tagbar-history*
 
+2.2 (2011-11-26)
+    - Small incompatible change: TagbarOpen now doesn't jump to the Tagbar
+      window anymore if it is already open. Use "TagbarOpen j" instead or see
+      its documentation for more options.
+    - Tags inside of scopes now have a header displaying their "kind".
+    - The Tagbar contents are now immediately updated on save for files
+      smaller than a configurable size.
+    - Tagbar can now be configured to jump to a tag with only a single-click
+      instead of a double-click.
+    - Most of the script has been moved to the |autoload| directory, so Vim
+      startup should be faster (thanks to Kien N).
+    - Jumping to tags should work most of the time even if the file has been
+      modified and not saved.
+    - If Ctags has been installed into the default location using Homebrew or
+      MacPorts it should now be found automatically.
+    - Several bugfixes.
+
 2.1 (2011-05-29)
     - Make Tagbar work in (hopefully) all cases under Windows
     - Handle cases where 'encoding' is different from system encoding, for
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index d078c24..e8add1f 100644
--- a/plugin/tagbar.vim
+++ b/plugin/tagbar.vim
@@ -4,7 +4,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.1
+" Version:     2.2
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
@@ -26,6 +26,22 @@ endif
 
 " Basic init {{{1
 
+if v:version < 700
+    echohl WarningMsg
+    echomsg 'Tagbar: Vim version is too old, Tagbar requires at least 7.0'
+    echohl None
+    finish
+endif
+
+if v:version == 700 && !has('patch167')
+    echohl WarningMsg
+    echomsg 'Tagbar: Vim versions lower than 7.0.167 have a bug'
+          \ 'that prevents this version of Tagbar from working.'
+          \ 'Please use the alternate version posted on the website.'
+    echohl None
+    finish
+endif
+
 if !exists('g:tagbar_left')
     let g:tagbar_left = 0
 endif
diff --git a/syntax/tagbar.vim b/syntax/tagbar.vim
index 3e4fd4f..89458fd 100644
--- a/syntax/tagbar.vim
+++ b/syntax/tagbar.vim
@@ -3,7 +3,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.1
+" Version:     2.2
 
 scriptencoding utf-8