diff --git a/ChangeLog b/ChangeLog
index 5145e56..2665648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+version 2.2:
+	- Support to silence Python-not-found warnings. *UltiSnips-python-warning*
+	- Matchit support for snippet files.
+	- Improvements to syntax file.
 	- Various smaller bug fixes.
 	- New command to manually add a filetype to the list for the current
 	  buffer. *:UltiSnipsAddFiletypes*
-	- New or improved snippets: snippets, haskell, bindzone, python, golang,
+	- New or improved snippets: all, snippets, haskell, bindzone, python, golang,
 	  json, html, coffee, coffee_jasmine, javascript_jasmine, ruby, php,
 	  markdown.
 
diff --git a/doc/UltiSnips.txt b/doc/UltiSnips.txt
index 6d6c54f..36c7e05 100644
--- a/doc/UltiSnips.txt
+++ b/doc/UltiSnips.txt
@@ -16,7 +16,7 @@ UltiSnips                                      *snippet* *snippets* *UltiSnips*
    3.5 Functions                                |UltiSnips-functions|
       3.5.1 UltiSnips_AddSnippet                |UltiSnips_AddSnippet|
       3.5.2 UltiSnips_Anon                      |UltiSnips_Anon|
-   3.6 Missing python support                   |Ultisnips-python-warning|
+   3.6 Missing python support                   |UltiSnips-python-warning|
 4. Syntax                                       |UltiSnips-syntax|
    4.1 Adding Snippets                          |UltiSnips-adding-snippets|
       4.1.1 Character Escaping                  |UltiSnips-character-escaping|
@@ -330,12 +330,12 @@ This is required in order for UltiSnips to have access to the characters
 typed so it can determine if the trigger matches or not.
 
 
-3.6 Warning about missing python support           *Ultisnips-python-warning*
+3.6 Warning about missing python support           *UltiSnips-python-warning*
 ----------------------------------------
 
 When UltiSnips is loaded, it will check that the running Vim was compiled with
 python support.  If no support is detected, a warning will be displayed and
-loading of Ultisnips will be skipped.
+loading of UltiSnips will be skipped.
 
 If you would like to suppress this warning message, you may add the following
 line to your vimrc file.