diff --git a/ChangeLog b/ChangeLog
index f814d6116..a96dc6dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/ejabberd_auth_anonymous.erl: Correct include declaration (thanks 
 	to badlop). Bug was introduced in r1863.
 
+	* src/ejabberd_s2s_in.erl, src/ejabberd_s2s_out.erl: Serialize stanzas
+	to iolist().
+
 2009-03-01  Pablo Polvorin <pablo.polvorin@process-one.net>
 
 	* src/ejabberd_auth_anonymous.erl: Host argument for ejabberd_hooks's 
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index b2bd7fd8e..ea1f3e597 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -554,9 +554,9 @@ send_text(StateData, Text) ->
 
 
 send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
-    send_text(StateData, exmpp_stream:to_list(El));
+    send_text(StateData, exmpp_stream:to_iolist(El));
 send_element(StateData, El) ->
-    send_text(StateData, exmpp_stanza:to_list(El)).
+    send_text(StateData, exmpp_stanza:to_iolist(El)).
 
 
 change_shaper(StateData, Host, JID) ->
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 8833309e5..029e3e631 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -799,9 +799,9 @@ send_text(StateData, Text) ->
     ejabberd_socket:send(StateData#state.socket, Text).
 
 send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
-    send_text(StateData, exmpp_stream:to_list(El));
+    send_text(StateData, exmpp_stream:to_iolist(El));
 send_element(StateData, El) ->
-    send_text(StateData, exmpp_stanza:to_list(El)).
+    send_text(StateData, exmpp_stanza:to_iolist(El)).
 
 send_queue(StateData, Q) ->
     case queue:out(Q) of