diff --git a/ChangeLog b/ChangeLog
index 31961973a..b4c50fb4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-20  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_listener.erl: When stopping a listener, don't stop
+	the listener supervisor (EJAB-874)
+
 2009-02-19  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index 337267726..4a75a7cb4 100644
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -260,10 +260,7 @@ start_listener_sup(Port, Module, Opts) ->
 
 stop_listener(Port, Module) ->
     supervisor:terminate_child(ejabberd_listeners, Port),
-    supervisor:delete_child(ejabberd_listeners, Port),
-    Proc1 = gen_mod:get_module_proc("sup", Module),
-    supervisor:terminate_child(ejabberd_sup, Proc1),
-    supervisor:delete_child(ejabberd_sup, Proc1).
+    supervisor:delete_child(ejabberd_listeners, Port).
 
 %% @spec (PortIP, Module, Opts) -> {ok, Pid} | {error, Error}
 %% where