diff --git a/ChangeLog b/ChangeLog
index 742e32930..0e33f8829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+ 	* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
+ 	older than 2.0.2 had indexes for parentid and type. This is not
+ 	required since ejabberd 2.0.2, so those indexes can be
+ 	deleted. (EJAB-669)
+
  	* doc/Makefile: In Clean do not remove html. In new Distclean,
 	remove also html.
 
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 21286dd37..0721ae65f 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -235,6 +235,8 @@ init_nodes(Host, ServerHost, ServedHosts) ->
     ok.
 
 update_database(Host) ->
+    mnesia:del_table_index(pubsub_node, type),
+    mnesia:del_table_index(pubsub_node, parentid),
     case catch mnesia:table_info(pubsub_node, attributes) of
 	[host_node, host_parent, info] ->
 	    ?INFO_MSG("upgrade pubsub tables",[]),