diff --git a/ChangeLog b/ChangeLog
index f12ab5cd0..fe63130b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-29  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
+
+	* src/jlib.erl (parse_xdata_submit, parse_xdata_fields): Fix a bug
+	where exmpp_xml:get_attribute_from_list/3 was called with only 2
+	arguments; this code has not been updated when exmpp_xml's API
+	changed...
+
 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/jlib.erl b/src/jlib.erl
index b64fc3a1b..73fc5fc0f 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -453,7 +453,7 @@ iq_to_xml(#iq{id = ID, type = Type, sub_el = SubEl}) ->
 
 
 parse_xdata_submit({xmlel, _, _, _, Attrs, Els}) ->
-    case exmpp_xml:get_attribute_from_list(Attrs, 'type') of
+    case exmpp_xml:get_attribute_from_list(Attrs, 'type', "") of
 	"submit" ->
 	    lists:reverse(parse_xdata_fields(Els, []));
 	_ ->
@@ -472,7 +472,7 @@ parse_xdata_fields([], Res) ->
     Res;
 parse_xdata_fields([{xmlel, _, _, 'field', Attrs, SubEls} | Els],
   Res) ->
-    case exmpp_xml:get_attribute_from_list(Attrs, 'var') of
+    case exmpp_xml:get_attribute_from_list(Attrs, 'var', "") of
 	"" ->
 	    parse_xdata_fields(Els, Res);
 	Var ->