diff --git a/ChangeLog b/ChangeLog
index 4a6bf0371..c274b80c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-25  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Speedup startup with many pubsub
+	nodes (EJAB-669)
+	* src/mod_pubsub/nodetree_default.erl: Likewise
+
 2008-07-24  Badlop  <badlop@process-one.net>
 
 	* doc/guide.tex: Include example PAM configuration file
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index fc4df8fe5..77f44a698 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -286,8 +286,7 @@ update_database(Host) ->
 			mnesia:delete_table(pubsub_node),
 			mnesia:create_table(pubsub_node,
 					    [{disc_copies, [node()]},
-					     {attributes, record_info(fields, pubsub_node)},
-					     {index, [type, parentid]}]),
+					     {attributes, record_info(fields, pubsub_node)}]),
 			lists:foreach(fun(Record) ->
 					      mnesia:write(Record)
 				      end, NewRecords)
diff --git a/src/mod_pubsub/nodetree_default.erl b/src/mod_pubsub/nodetree_default.erl
index 732e72b3f..d80d215e6 100644
--- a/src/mod_pubsub/nodetree_default.erl
+++ b/src/mod_pubsub/nodetree_default.erl
@@ -70,8 +70,7 @@
 init(_Host, _ServerHost, _Opts) ->
     mnesia:create_table(pubsub_node,
 			[{disc_copies, [node()]},
-			 {attributes, record_info(fields, pubsub_node)},
-			 {index, [type,parentid]}]),
+			 {attributes, record_info(fields, pubsub_node)}]),
     NodesFields = record_info(fields, pubsub_node),
     case mnesia:table_info(pubsub_node, attributes) of
 	[host_node, host_parent, info] -> ok;  % old schema, updated later by pubsub
@@ -114,7 +113,7 @@ get_nodes(Key) ->
 %%     Host = mod_pubsub:host()
 %%     Node = mod_pubsub:pubsubNode()
 get_subnodes(Host, Node) ->
-    mnesia:index_read(pubsub_node, {Host, Node}, #pubsub_node.parentid).
+    mnesia:match_object(#pubsub_node{parentid = {Host, Node}, _ = '_'}).
 
 %% @spec (Host, Index) -> [pubsubNode()] | {error, Reason}
 %%     Host = mod_pubsub:host()