diff --git a/ChangeLog b/ChangeLog
index dcf564881..5739e451c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
 	* src/mod_roster.erl (push_item), src/mod_roster_odbc.erl (push_item):
 	Fix a bug in #xmlel construction: children must be a list.
 
+	* src/ejabberd_receiver.erl: Add the {autoload_known, true} flag to
+	the XML parser options. This allows modules to extend the known
+	nss/names/attrs with their own data.
+
 2008-09-25  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/jlib.erl (timestamp_to_xml): Create an #xmlel element, not an
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index 6d5b30ec3..adf2634a0 100644
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -163,6 +163,7 @@ handle_call({become_controller, C2SPid}, _From, State) ->
     Parser = exmpp_xml:start_parser([
       {namespace, true},
       {name_as_atom, true},
+      {autoload_known, true},
       {maxsize, State#state.max_stanza_size}
     ]),
     XMLStreamState = exmpp_xmlstream:start(