diff --git a/ChangeLog b/ChangeLog
index ed1f9f375..a14833899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-05  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)
+
 2009-02-03  Badlop  <badlop@process-one.net>
 
 	* doc/Makefile: When cleaning, remove contributed_modules.tex.
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 291c5189c..c0f500af2 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -235,6 +235,8 @@ init_nodes(Host, ServerHost) ->
     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",[]),