diff --git a/ChangeLog b/ChangeLog
index 7b106efc2..997cedfe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
 	* src/mod_vcard_odbc.erl (do_route/4): Replace jlib:iq_to_xml/1 by
 	exmpp_iq:iq_to_xmlel/1.
 
+	* src/mod_roster_odbc.erl (user_roster_subscribe_jid/3): Fix a bug
+	where the wrong module was called (jlib instead of exmpp_jid).
+
 2008-10-09  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/ejabberd_c2s.erl: Fix handling of unauthenticated stanzas which
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 8f329f7ab..cd4a32c49 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -1009,7 +1009,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
 
 user_roster_subscribe_jid(User, Server, JID) ->
     out_subscription(User, Server, JID, subscribe),
-    UJID = jlib:make_bare_jid(User, Server),
+    UJID = exmpp_jid:make_bare_jid(User, Server),
     ejabberd_router:route(
       UJID, JID, exmpp_presence:subscribe()).
 
@@ -1032,7 +1032,7 @@ user_roster_item_parse_query(User, Server, Items, Query) ->
 		      case lists:keysearch(
 			     "remove" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of
 			  {value, _} ->
-			      UJID = jlib:make_bare_jid(User, Server),
+			      UJID = exmpp_jid:make_bare_jid(User, Server),
 			      Attrs1 = exmpp_xml:set_attribute_in_list([],
 				'jid', exmpp_jid:jid_to_list(JID)),
 			      Attrs2 = exmpp_xml:set_attribute_in_list(Attrs1,