diff --git a/ChangeLog b/ChangeLog
index 5a5b46860..8e4ed34f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-04  Moritz Bunkus  <moritz@bunkus.org>
+
+	* Released v2.2.0.
+
 2008-02-29  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: new feature: Added support for handling AC3 in WAV in
diff --git a/README b/README
index b6bc461bd..305fb49ef 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-MKVToolNix 2.1.0
+MKVToolNix 2.2.0
 ================
 
 With these tools one can get information about (mkvinfo) Matroska
diff --git a/README.Windows.txt b/README.Windows.txt
index 226ec7f8a..7c03e9725 100644
--- a/README.Windows.txt
+++ b/README.Windows.txt
@@ -1,4 +1,4 @@
-mkvtoolnix 2.1.0 and Windows
+mkvtoolnix 2.2.0 and Windows
 ----------------------------
 
 ---[ NOTE 1 ]---------------------------------------------------------
diff --git a/configure.in b/configure.in
index 70e4adb19..7e30dfbc5 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREREQ(2.50)
 AC_CONFIG_HEADERS(config.h:config.h.in)
 
 PACKAGE="mkvtoolnix"
-VERSION="2.1.0"
+VERSION="2.2.0"
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec
index 68f7f24d5..cfbc172fa 100644
--- a/contrib/fedora-core.spec
+++ b/contrib/fedora-core.spec
@@ -2,7 +2,7 @@
 
 Summary: mkvtoolnix
 Name: mkvtoolnix
-Version: 2.1.0
+Version: 2.2.0
 Release: 1
 License: GPL
 Group: Multimedia
diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec
index 5c041f8ca..8ba4780b5 100644
--- a/contrib/opensuse-10.spec
+++ b/contrib/opensuse-10.spec
@@ -8,7 +8,7 @@ BuildRequires: expat flac flac-devel gcc-c++ gtk2 gtk2-devel libogg libogg-devel
 
 Name:         mkvtoolnix
 URL:          http://www.bunkus.org/videotools/mkvtoolnix/
-Version: 2.1.0
+Version: 2.2.0
 Release: 1
 Summary:      tools to create, alter and inspect Matroska files
 License:      GPL
diff --git a/debian/changelog b/debian/changelog
index f8c6a8f87..d154debb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mkvtoolnix (2.2.0) unstable; urgency=low
+
+  * New version. The package was renamed to mkvtoolnix and
+    mkvtoolnix-gui keeping in line with the official Debian packages.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon,  3 Mar 2008 17:59:26 +0100
+
 mkvtoolnix (2.1.0-1) unstable; urgency=low
 
   * New version.
diff --git a/doc/base64tool.1 b/doc/base64tool.1
index 1bc49baeb..5cc5b52a3 100644
--- a/doc/base64tool.1
+++ b/doc/base64tool.1
@@ -1,4 +1,4 @@
-.TH BASE64TOOL "1" "August 2007" "base64tool v2.1.0" "User Commands"
+.TH BASE64TOOL "1" "March 2008" "base64tool v2.2.0" "User Commands"
 
 
 .SH NAME
diff --git a/doc/mkvextract.1 b/doc/mkvextract.1
index 1cccf97f2..e864689de 100644
--- a/doc/mkvextract.1
+++ b/doc/mkvextract.1
@@ -1,4 +1,4 @@
-.TH MKVEXTRACT "1" "August 2007" "mkvextract v2.1.0" "User Commands"
+.TH MKVEXTRACT "1" "March 2008" "mkvextract v2.2.0" "User Commands"
 
 
 .SH NAME
diff --git a/doc/mkvinfo.1 b/doc/mkvinfo.1
index 57e829cd8..64332a5a9 100644
--- a/doc/mkvinfo.1
+++ b/doc/mkvinfo.1
@@ -1,4 +1,4 @@
-.TH MKVINFO "1" "August 2007" "mkvinfo v2.1.0" "User Commands"
+.TH MKVINFO "1" "March 2008" "mkvinfo v2.2.0" "User Commands"
 .SH NAME
 mkvinfo \- Print information about tracks in Matroska files
 .SH SYNOPSIS
diff --git a/doc/mkvmerge.1 b/doc/mkvmerge.1
index 045b55037..7749314c8 100644
--- a/doc/mkvmerge.1
+++ b/doc/mkvmerge.1
@@ -1,4 +1,4 @@
-.TH MKVMERGE "1" "August 2007" "mkvmerge v2.1.0" "User Commands"
+.TH MKVMERGE "1" "March 2008" "mkvmerge v2.2.0" "User Commands"
 
 
 .SH NAME
diff --git a/doc/mmg.1 b/doc/mmg.1
index d53d76b69..22d127902 100644
--- a/doc/mmg.1
+++ b/doc/mmg.1
@@ -1,4 +1,4 @@
-.TH MMG "1" "August 2007" "mmg v2.1.0" "User Commands"
+.TH MMG "1" "March 2008" "mmg v2.2.0" "User Commands"
 
 
 .SH NAME
diff --git a/mkvtoolnix-unicode.nsi b/mkvtoolnix-unicode.nsi
index 450fbc688..4a39839ac 100644
--- a/mkvtoolnix-unicode.nsi
+++ b/mkvtoolnix-unicode.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "MKVtoolnix"
-!define PRODUCT_VERSION "2.1.0"
+!define PRODUCT_VERSION "2.2.0"
 !define PRODUCT_PUBLISHER "Moritz Bunkus"
 !define PRODUCT_WEB_SITE "http://www.bunkus.org/videotools/mkvtoolnix/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe"
diff --git a/mkvtoolnix.nsi b/mkvtoolnix.nsi
index 32eb715e0..3118d60cf 100644
--- a/mkvtoolnix.nsi
+++ b/mkvtoolnix.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "MKVtoolnix"
-!define PRODUCT_VERSION "2.1.0"
+!define PRODUCT_VERSION "2.2.0"
 !define PRODUCT_PUBLISHER "Moritz Bunkus"
 !define PRODUCT_WEB_SITE "http://www.bunkus.org/videotools/mkvtoolnix/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe"
diff --git a/src/common/common.h b/src/common/common.h
index 554a08699..30a1da4ab 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -56,7 +56,7 @@ namespace libebml {
 
 using namespace libebml;
 
-#define VERSIONNAME "Another Place To Fall"
+#define VERSIONNAME "Turn It On Again"
 #define VERSIONINFO "mkvmerge v" VERSION " ('" VERSIONNAME "')"
 #define BUGMSG _("This should not have happened. Please contact the author " \
                  "Moritz Bunkus <moritz@bunkus.org> with this error/warning " \