diff --git a/ChangeLog b/ChangeLog
index 5dd932891..071ee2568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-21  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: disco#items bugfix (EJAB-465)
+
 2007-12-21  Badlop  <badlop@process-one.net>
 
 	* src/msgs/uk.msg: Updated (thanks to Ruslan Rakhmanin)
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 194bc920a..fcb146821 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -300,15 +300,17 @@ disco_local_identity(Acc, _From, _To, [], _Lang) ->
 disco_local_identity(Acc, _From, _To, _Node, _Lang) ->
     Acc.
 
-disco_local_features(Acc, _From, To, Node, _Lang) ->
+disco_local_features(Acc, _From, To, [], _Lang) ->
     Host = To#jid.lserver,
     Feats = case Acc of
 	{result, I} -> I;
-	_ -> [] 
-    end,    
+	_ -> []
+    end,
     {result, Feats ++ lists:map(fun(Feature) ->
 	?NS_PUBSUB++"#"++Feature
-    end, features(Host, Node))}.
+    end, features(Host, []))};
+disco_local_features(Acc, _From, _To, _Node, _Lang) ->
+    Acc.
 
 disco_local_items(Acc, _From, _To, [], _Lang) ->
     Acc;