diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index e514296..0cb74ad 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.5
+" Version:     2.6
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index ddfdc0a..35a9c49 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.5
+Version:        2.6
 
 ==============================================================================
 Contents                                            *tagbar* *tagbar-contents*
@@ -1231,6 +1231,20 @@ file.
 ==============================================================================
 8. History                                                    *tagbar-history*
 
+2.6 (2013-12-06)
+    - Added possibility to show tags in the preview window, either manually or
+      automatically.
+    - Allow customizing the statusline, see :help g:tagbar_status_func.
+    - Type configuration can now be project-specific.
+    - The keybindings in the Tagbar window are now configurable.
+    - Improvements to Ctags execution on Windows, thanks to Darcy Parker.
+    - Added function tagbar#currentfile() that returns the path to the file
+      currently being displayed in Tagbar, thanks to Zhao Cai.
+    - Added a :Tagbar command as an alias for :TagbarToggle.
+    - Added an way to ignore specific files in case they create problems.
+    - Optionally show line numbers in the Tagbar window.
+    - The usual bunch of small improvements and bugfixes.
+
 2.5 (2013-03-25)
     - New command :TagbarTogglePause to freeze Tagbar in its current state so
       you can switch to other files while keeping the old information
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index b7f2f53..fa6ea06 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.5
+" Version:     2.6
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
diff --git a/syntax/tagbar.vim b/syntax/tagbar.vim
index 5a17660..061286a 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.5
+" Version:     2.6
 
 scriptencoding utf-8