Index: src/XMPPStanza.m
==================================================================
--- src/XMPPStanza.m
+++ src/XMPPStanza.m
@@ -19,10 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "XMPPConnection.h"
 #import "XMPPStanza.h"
 #import "XMPPJID.h"
 
 @implementation XMPPStanza
 + stanzaWithName: (OFString*)name
@@ -91,11 +92,13 @@
 		if (![name_ isEqual: @"iq"] && ![name_ isEqual: @"message"] &&
 		    ![name_ isEqual: @"presence"])
 			@throw [OFInvalidArgumentException newWithClass: isa
 							       selector: _cmd];
 
-		[self setDefaultNamespace: @"jabber:client"];
+		[self setDefaultNamespace: XMPP_NS_CLIENT];
+		[self setPrefix: @"stream"
+		   forNamespace: XMPP_NS_STREAM];
 
 		if (type_ != nil)
 			[self setType: type_];
 
 		if (ID_ != nil)
@@ -135,10 +138,14 @@
 		}
 
 		enumerator = [[elem children] objectEnumerator];
 		while ((el = [enumerator nextObject]) != nil)
 			[self addChild: el];
+
+		[self setDefaultNamespace: XMPP_NS_CLIENT];
+		[self setPrefix: @"stream"
+		   forNamespace: XMPP_NS_STREAM];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}