diff --git a/ChangeLog b/ChangeLog
index e0bb52ad1..727c47ec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-19  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
+
+	* src/ejabberd_receiver.erl: Replace the use of xml_stream by
+	exmpp_xmlstream. exmpp_xml is configured to produce old #xmlelement
+	records. exmpp_xmlstream is configured to send old xmlstreamstart
+	tuple. Users are able to connect to ejabberd. Next step:
+	ejabberd_c2s.
+
+2008-06-19  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
+
+	Start the transition to exmpp.
+
 2008-06-18  Badlop  <badlop@process-one.net>
 
 	* src/ejabberd.app: The ejabberd version number is defined in the
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index 72b3608d6..208ec6a39 100644
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -131,11 +131,8 @@ init([Socket, SockMod, Shaper, MaxStanzaSize]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call({starttls, TLSSocket}, _From,
-	    #state{xml_stream_state = XMLStreamState,
-		   c2s_pid = C2SPid,
-		   max_stanza_size = MaxStanzaSize} = State) ->
-    close_stream(XMLStreamState),
-    NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
+	    #state{xml_stream_state = XMLStreamState} = State) ->
+    NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
     NewState = State#state{socket = TLSSocket,
 			   sock_mod = tls,
 			   xml_stream_state = NewXMLStreamState},
@@ -146,11 +143,8 @@ handle_call({starttls, TLSSocket}, _From,
 	    {stop, normal, ok, NewState}
     end;
 handle_call({compress, ZlibSocket}, _From,
-	    #state{xml_stream_state = XMLStreamState,
-		   c2s_pid = C2SPid,
-		   max_stanza_size = MaxStanzaSize} = State) ->
-    close_stream(XMLStreamState),
-    NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
+	    #state{xml_stream_state = XMLStreamState} = State) ->
+    NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
     NewState = State#state{socket = ZlibSocket,
 			   sock_mod = ejabberd_zlib,
 			   xml_stream_state = NewXMLStreamState},
@@ -161,15 +155,21 @@ handle_call({compress, ZlibSocket}, _From,
 	    {stop, normal, ok, NewState}
     end;
 handle_call(reset_stream, _From,
-	    #state{xml_stream_state = XMLStreamState,
-		   c2s_pid = C2SPid,
-		   max_stanza_size = MaxStanzaSize} = State) ->
-    close_stream(XMLStreamState),
-    NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
+	    #state{xml_stream_state = XMLStreamState} = State) ->
+    NewXMLStreamState = exmpp_xmlstream:reset(XMLStreamState),
     Reply = ok,
     {reply, Reply, State#state{xml_stream_state = NewXMLStreamState}};
 handle_call({become_controller, C2SPid}, _From, State) ->
-    XMLStreamState = xml_stream:new(C2SPid, State#state.max_stanza_size),
+    % XXX OLD FORMAT
+    Parser = exmpp_xml:start_parser([
+      {namespace, false},
+      {name_as_atom, false},
+      {maxsize, State#state.max_stanza_size}
+    ]),
+    XMLStreamState = exmpp_xmlstream:start(
+      {gen_fsm, C2SPid}, Parser,
+      [{xmlstreamstart, old}]
+    ),
     NewState = State#state{c2s_pid = C2SPid,
 			   xml_stream_state = XMLStreamState},
     activate_socket(NewState),
@@ -291,7 +291,7 @@ process_data(Data,
 		    shaper_state = ShaperState,
 		    c2s_pid = C2SPid} = State) ->
     ?DEBUG("Received XML on stream = ~p", [binary_to_list(Data)]),
-    XMLStreamState1 = xml_stream:parse(XMLStreamState, Data),
+    {ok, XMLStreamState1} = exmpp_xmlstream:parse(XMLStreamState, Data),
     {NewShaperState, Pause} = shaper:update(ShaperState, size(Data)),
     if
 	C2SPid == undefined ->
@@ -307,4 +307,5 @@ process_data(Data,
 close_stream(undefined) ->
     ok;
 close_stream(XMLStreamState) ->
-    xml_stream:close(XMLStreamState).
+    exmpp_xml:stop_parser(exmpp_xmlstream:get_parser(XMLStreamState)),
+    exmpp_xmlstream:stop(XMLStreamState).