diff --git a/ChangeLog b/ChangeLog
index 90d0a89dd..253cd4895 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-26  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: get_items bugfix (EJAB-716)
+
 2008-08-25  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/mod_privacy_odbc.erl: Prevent case_clause error when
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 8cc331f21..4d18eb95a 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -933,7 +933,7 @@ iq_pubsub(Host, ServerHost, From, IQType, SubEl, _Lang, Access, Plugins) ->
 			({xmlelement, "item", ItemAttrs, _}, Acc) ->
 			    case xml:get_attr_s("id", ItemAttrs) of
 			    "" -> Acc;
-			    ItemID -> ItemID
+			    ItemID -> [ItemID|Acc]
 			    end;
 			(_, Acc) ->
 			    Acc
@@ -1692,8 +1692,8 @@ get_items(Host, Node, From, SubId, SMaxItems, ItemIDs) ->
 			[] -> 
 			    Items;
 			_ ->
-			    lists:filter(fun(Item) ->
-				lists:member(Item, ItemIDs)
+			    lists:filter(fun(#pubsub_item{itemid = {ItemId, _}}) ->
+				lists:member(ItemId, ItemIDs)
 			    end, Items) 
 			end,
 		    %% Generate the XML response (Item list), limiting the