diff --git a/build.gradle b/build.gradle
index 200309eed..4f0ffcfd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ allprojects {
 
 	ext {
 		shortVersion = '4.0.1'
-		isSnapshot = true
+		isSnapshot = false
 		gitCommit = getGitCommit()
 		javadocAllDir = new File(buildDir, 'javadoc')
 		documentationDir = new File(projectDir, 'documentation')
diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index efe216bce..394774f98 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -141,6 +141,42 @@ hr {
 
 	<div id="pageBody">
 
+<h2>4.0.1 -- <span style="font-weight: normal;">2014-07-20</span></h2>
+
+<h2>        Sub-task
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-346'>SMACK-346</a>] -         Bug in return code for rejection handling in FileTransferManager
+</li>
+</ul>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-574'>SMACK-574</a>] -         Documentation still refers at some places to Connection
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-575'>SMACK-575</a>] -         PingManager schedules pings after pingInterval when it should be use nextPingIn instead
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-577'>SMACK-577</a>] -         Bookmarks and FormField toXml() methods do not properly escape XML
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-583'>SMACK-583</a>] -         PacketListeners may not be invoked in delivery order
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-576'>SMACK-576</a>] -         smack-resolver-javax should become a OSGi ServiceComponent
+</li>
+</ul>
+
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-580'>SMACK-580</a>] -         Add support for retrieving a PubSub node&#39;s affiliations
+</li>
+</ul>
+
 <h2>4.0.0 -- <span style="font-weight: normal;">2014-06-08</span></h2>
             
 <h2>        Sub-task