diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 3fece7814..9fd435d1f 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -906,7 +906,7 @@ public class XmppConnection implements Runnable {
 			if (connection.streamFeatures == null) {
 				return false;
 			} else {
-				return connection.streamFeatures.hasChild("csi");
+				return connection.streamFeatures.hasChild("csi","urn:xmpp:csi:0");
 			}
 		}
 		
diff --git a/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
index 6dd6b2e8f..78ab66d8f 100644
--- a/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
+++ b/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
@@ -5,6 +5,6 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 public class ActivePacket extends AbstractStanza {
 	public ActivePacket() {
 		super("active");
-		setAttribute("xmlns", "urn:xmpp:csi");
+		setAttribute("xmlns", "urn:xmpp:csi:0");
 	}
 }
diff --git a/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
index f3cf5ce03..f109280f1 100644
--- a/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
+++ b/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
@@ -5,6 +5,6 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 public class InactivePacket extends AbstractStanza {
 	public InactivePacket() {
 		super("inactive");
-		setAttribute("xmlns", "urn:xmpp:csi");
+		setAttribute("xmlns", "urn:xmpp:csi:0");
 	}
 }