diff --git a/build/build.xml b/build/build.xml
index 00c10cbed..b146852a2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -36,7 +36,7 @@
     <property name="resources.dir" value="${basedir}/build/resources" />
 
     <property name="version.major" value="2" />
-    <property name="version.minor" value="1" />
+    <property name="version.minor" value="2" />
     <property name="version.revision" value="0" />
     <property name="version.name" value="${version.major}.${version.minor}.${version.revision}" />
 
diff --git a/build/resources/releasedocs/README.html b/build/resources/releasedocs/README.html
index 6466cda3d..f420da991 100644
--- a/build/resources/releasedocs/README.html
+++ b/build/resources/releasedocs/README.html
@@ -56,10 +56,10 @@ Smack Readme
 <table boder=0>
 <tr>
 	<td>version:</td>
-	<td><b>2.1.0</b></td>
+	<td><b>2.2.0</b></td>
 </tr><tr>
 	<td>released:</td>
-	<td><b>November 17, 2005</b></td>
+	<td><b>March 9, 2006</b></td>
 </tr>
 </table>
 
diff --git a/build/resources/releasedocs/changelog.html b/build/resources/releasedocs/changelog.html
index 260a7938c..49600d139 100644
--- a/build/resources/releasedocs/changelog.html
+++ b/build/resources/releasedocs/changelog.html
@@ -55,6 +55,33 @@
 Smack Changelog
 </div>
 
+<p>
+<b>2.2.0</b> -- March 9, 2006
+<p>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-122'>SMACK-122</a>] - Added support for JEP-96: File Transfer.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-72'>SMACK-72</a>] - Added support for JEP-47: In-Band Bytestreams.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-122'>SMACK-122</a>] - Added support for JEP-65: SOCKS5 Bytestreams</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-112'>SMACK-112</a>] - Added support for JEP-38 Stream Compression.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-117'>SMACK-117</a>] - Added support for JEP-33: Extended Stanza Addressing.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-27'>SMACK-27</a>] - Certification validation is now pluggable.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-118'>SMACK-118</a>] - Added methods to dynamically remove providers.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-125'>SMACK-125</a>] - Added support for deaf occupant in MUC rooms.</li>
+
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-109'>SMACK-109</a>] - Optimized client performance.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-113'>SMACK-113</a>] - Added support for choosing if TLS should be used or not.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-114'>SMACK-114</a>] - Added support for choosing if SASL should be used or not.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-123'>SMACK-123</a>] - A thread is no longer used for packet writer listeners.</li>
+
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-110'>SMACK-110</a>] - Resource binding and session establishment are now requested only if the server offered them.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-111'>SMACK-111</a>] - Fixed concurrency issue with date formatter.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-116'>SMACK-116</a>] - Fixed vCard issues.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-119'>SMACK-119</a>] - Fixed AccessControlException when using vCard from an applet.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-120'>SMACK-120</a>] - Listener thread was not being shutdown properly.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-124'>SMACK-124</a>] - Parsing resource binding packets was requiring smackx.jar file to be in the classpath.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/SMACK-97'>SMACK-97</a>] - Fixed functional test failures in PresencePriorityTest and RosterTest.</li>
+</ul>
+
 <p>
 <b>2.1.0</b> -- November 17, 2005
 <p>
diff --git a/source/org/jivesoftware/smack/SmackConfiguration.java b/source/org/jivesoftware/smack/SmackConfiguration.java
index ccb012293..250f372d6 100644
--- a/source/org/jivesoftware/smack/SmackConfiguration.java
+++ b/source/org/jivesoftware/smack/SmackConfiguration.java
@@ -20,12 +20,12 @@
 
 package org.jivesoftware.smack;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.xmlpull.v1.*;
 import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParser;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
 
 /**
  * Represents the configuration of Smack. The configuration is used for:
@@ -44,7 +44,7 @@ import org.xmlpull.mxp1.MXParser;
  */
 public final class SmackConfiguration {
 
-    private static final String SMACK_VERSION = "2.1.0";
+    private static final String SMACK_VERSION = "2.2.0";
 
     private static int packetReplyTimeout = 5000;
     private static int keepAliveInterval = 30000;