diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 8cbbe2765..5d21b124b 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -446,8 +446,12 @@ restore_mnesia(Path) ->
 %% mod_configure/adhoc 
 restore(Path) ->
     mnesia:restore(Path, [{keep_tables,keep_tables()},
+			  {skip_tables, skip_tables()},
 			  {default_op, skip_tables}]).
 
+skip_tables() ->
+    [disco_publish,user_caps,user_caps_resources].
+
 %% This function return a list of tables that should be kept from a previous
 %% version backup.
 %% Obsolete tables or tables created by module who are no longer used are not