diff --git a/ChangeLog b/ChangeLog
index eb9978fb3..662fc2d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-30  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_disco.erl: Minor fix
+
 2005-10-29  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/mod_roster_odbc.erl: Bugfix
diff --git a/src/mod_disco.erl b/src/mod_disco.erl
index f04d4d952..d938db7bf 100644
--- a/src/mod_disco.erl
+++ b/src/mod_disco.erl
@@ -182,12 +182,14 @@ get_local_identity(Acc, _From, _To, _Node, _Lang) ->
 get_local_features({error, _Error} = Acc, _From, _To, _Node, _Lang) ->
     Acc;
 
-get_local_features(Acc, _From, _To, [], _Lang) ->
+get_local_features(Acc, _From, To, [], _Lang) ->
     Feats = case Acc of
 		{result, Features} -> Features;
 		empty -> []
 	    end,
-    {result, ets:tab2list(disco_features) ++ Feats};
+    Host = To#jid.lserver,
+    {result,
+     ets:select(disco_features, [{{{'_', Host}}, [], ['$_']}]) ++ Feats};
 
 get_local_features(Acc, _From, _To, _Node, _Lang) ->
     case Acc of