diff --git a/ChangeLog b/ChangeLog
index 1ce650dc3..946169075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-15  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/mod_echo.erl: The mod_echo can now be stopped without errors.
+	This is not a major issue, but can mislead other developers learning
+	from this example and test module (Thanks to Magnus Henoch).
+	
 	* TODO: Removed. The roadmap is managed on:
 	http://support.process-one.net/browse/EJAB
 
diff --git a/src/mod_echo.erl b/src/mod_echo.erl
index d37becb6a..c2b466ee5 100644
--- a/src/mod_echo.erl
+++ b/src/mod_echo.erl
@@ -52,7 +52,9 @@ start(Host, Opts) ->
 stop(Host) ->
     Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
     gen_server:call(Proc, stop),
-    supervisor:stop_child(ejabberd_sup, Proc).
+    supervisor:terminate_child(ejabberd_sup, Proc),
+    supervisor:delete_child(ejabberd_sup, Proc).
+
 
 %%====================================================================
 %% gen_server callbacks