diff -dPNur jabberd-1.4.4.orig/dialback/dialback_out.c jabberd-1.4.4.ds/dialback/dialback_out.c
--- jabberd-1.4.4.orig/dialback/dialback_out.c	2005-04-15 22:07:24.000000000 +0000
+++ jabberd-1.4.4.ds/dialback/dialback_out.c	2011-01-31 03:34:56.000000000 +0000
@@ -392,6 +392,10 @@
 
     log_debug2(ZONE, LOGT_IO, "outgoing packet with key %s and located existing %X",jid_full(key),md);
 
+//    printf("XMLNS: %s, %s\n", xmlnode_get_attrib(x, "xmlns"), xmlnode2str(x));
+    xmlnode_put_attrib(x, "xmlns", "jabber:server");
+//    printf("CORRECTED: %s, %s\n", xmlnode_get_attrib(x, "xmlns"), xmlnode2str(x));
+
     /* yay! that was easy, just send the packet :) */
     if(md != NULL)
     {
@@ -415,7 +419,7 @@
             dialback_in_verify(d, x); /* no connection to send db:verify to, bounce back to in to send failure */
             return;
         }
-
+	
         /* if the server is already connected, just write it */
         if(c->m != NULL)
         {
diff -dPNur jabberd-1.4.4.orig/jabberd/deliver.c jabberd-1.4.4.ds/jabberd/deliver.c
--- jabberd-1.4.4.orig/jabberd/deliver.c	2005-04-15 22:07:24.000000000 +0000
+++ jabberd-1.4.4.ds/jabberd/deliver.c	2011-01-31 03:34:38.000000000 +0000
@@ -480,6 +480,15 @@
         b = deliver_hashmatch(deliver__ns, xmlnode_get_attrib(p->x,"ns"));
     else if(p->type == p_LOG)
         b = deliver_hashmatch(deliver__logtype, xmlnode_get_attrib(p->x,"type"));
+
+/*
+    printf("XMLNS_DELIVER: %s (%i, %s)\n%s\n", xmlnode_get_attrib(p->x, "xmlns"), p->type, p->host, xmlnode2str(p->x));
+    if (((p->type == p_ROUTE)||(p->type == p_NORM))&&(!strcmp(p->host, "s2s"))) {
+	xmlnode_put_attrib(p->x, "xmlns", "jabber:server");
+	printf("XMLNS_ALTER: %s\n\n", xmlnode_get_attrib(p->x, "xmlns"));
+    }
+*/
+
     deliver_instance(deliver_intersect(a, b), p);
 }
 
diff -dPNur jabberd-1.4.4.orig/jsm/deliver.c jabberd-1.4.4.ds/jsm/deliver.c
--- jabberd-1.4.4.orig/jsm/deliver.c	2005-04-15 22:07:17.000000000 +0000
+++ jabberd-1.4.4.ds/jsm/deliver.c	2011-01-31 03:53:55.000000000 +0000
@@ -77,6 +77,10 @@
 	incremented++;
     }
 
+    //printf("LOCAL_DELIVER: %s (%i, %s)\n%s\n", xmlnode_get_attrib(p->x, "xmlns"), p->type, jid_full(p->to), xmlnode2str(p->x));
+    xmlnode_put_attrib(p->x, "xmlns", "jabber:client");
+    //printf("CORRECTED: %s (%i, %s)\n%s\n", xmlnode_get_attrib(p->x, "xmlns"), p->type, jid_full(p->to), xmlnode2str(p->x));
+
     log_debug2(ZONE, LOGT_DELIVER, "delivering locally to %s",jid_full(p->to));
     /* let some modules fight over it */
     if(js_mapi_call(si, e_DELIVER, p, user, s)) {