diff --git a/build/build.xml b/build/build.xml
index d9c1897..2e61b8f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -62,7 +62,7 @@
     <!-- ======================================================================================= -->
 
     <property name="version.major" value="3"/>
-    <property name="version.minor" value="5"/>
+    <property name="version.minor" value="6"/>
     <property name="version.revision" value="0"/>
     <property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' -->
     <property name="dist.prefix" value="connection_manager"/>
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
index 86c4b20..499db83 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
@@ -147,7 +147,7 @@
         name = JiveGlobals.getXMLProperty("xmpp.manager.name", StringUtils.randomString(5)).toLowerCase();
         serverName = JiveGlobals.getXMLProperty("xmpp.domain");
 
-        version = new Version(3, 5, 0, Version.ReleaseStatus.Release, -1);
+        version = new Version(3, 6, 0, Version.ReleaseStatus.Release, -1);
         if (serverName != null) {
             setupMode = false;
         }