diff --git a/build.gradle b/build.gradle
index e03f4f434..6ff9d7e61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -326,4 +326,4 @@ def getAndroidJavadocOffline() {
 	def androidHome = new File("$System.env.ANDROID_HOME")
 	if (!androidHome.isDirectory()) throw new Exception("ANDROID_HOME not found or set")
 	return "$System.env.ANDROID_HOME" + "/docs/reference"
-}
\ No newline at end of file
+}
diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index b3040bd4d..e7ad391c7 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -141,6 +141,23 @@ hr {
 
 	<div id="pageBody">
 
+<h2>4.0.4 -- <span style="font-weight: normal;">2014-09-05</span></h2>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-596'>SMACK-596</a>] -         Smack should load roster before sending the initial presence
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-598'>SMACK-598</a>] -         Smack should allow the empty string as content of message body element
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-601'>SMACK-601</a>] -         PubSub ItemProvider does only process the outermost namespace definition when creating PayloadItems
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-602'>SMACK-602</a>] -         PacketCollector must handle InterruptException
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-603'>SMACK-603</a>] -         XMPPError.Condition.equals() should be null-safe
+</li>
+</ul>
+
 <h2>4.0.3 -- <span style="font-weight: normal;">2014-08-16</span></h2>
 
 <h2>        Bug
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 98e7bd684..41c4d9eb0 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -171,7 +171,7 @@ public class PingManager extends Manager {
      * by the entity.
      * 
      * @param jid The id of the entity the ping is being sent to
-     * @param pingTimeout The time to wait for a reply
+     * @param pingTimeout The time to wait for a reply in milliseconds
      * @return true if a reply was received from the entity, false otherwise.
      * @throws NoResponseException if there was no response from the jid.
      * @throws NotConnectedException 
@@ -179,7 +179,7 @@ public class PingManager extends Manager {
     public boolean ping(String jid, long pingTimeout) throws NotConnectedException, NoResponseException {
         Ping ping = new Ping(jid);
         try {
-            connection().createPacketCollectorAndSend(ping).nextResultOrThrow();
+            connection().createPacketCollectorAndSend(ping).nextResultOrThrow(pingTimeout);
         }
         catch (XMPPException exc) {
             return jid.equals(connection().getServiceName());