diff --git a/ChangeLog b/ChangeLog
index 5e4fd3cc4..fe510501c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-15  Mickael Remond  <mickael.remond@process-one.net>
+
+	* src/ejabberd_ctl.erl: Bugfix: Now display all register commands for a
+	vhost and not only one (Thanks to Badlop).
+	* src/ejabberd.cfg.example: Fixed typo.
+
 2006-12-14  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/ejabberd_config.erl: Added loglevel option. It is now possible to
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index c10c58e21..2ef4550cc 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -1,6 +1,6 @@
 % $Id$
 
-% ejabberd loglevel (0: no log -> 5: debug))
+% ejabberd loglevel (0: no log -> 5: debug)
 {loglevel, 4}.
 
 %override_acls.
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
index 1d929c002..6ccfe36ef 100644
--- a/src/ejabberd_ctl.erl
+++ b/src/ejabberd_ctl.erl
@@ -185,7 +185,7 @@ process(["delete-old-messages", Days]) ->
 	    {atomic, _} = mod_offline:remove_old_messages(Integer),
 	    io:format("Removed messages older than ~s days~n", [Days]),
 	    ?STATUS_SUCCESS;
-	Integer ->
+	_Integer ->
 	    io:format("Can't delete old messages. Please pass a positive integer as parameter.~n", []),
 	    ?STATUS_ERROR
     end;
@@ -260,7 +260,7 @@ print_usage() ->
 print_vhost_usage(Host) ->
     CmdDescs =
 	ets:select(ejabberd_ctl_host_cmds,
-		   [{{Host, '$1', '$2'}, [], [{{'$1', '$2'}}]}]),
+		   [{{{Host, '$1'}, '$2'}, [], [{{'$1', '$2'}}]}]),
     MaxCmdLen =
 	if
 	    CmdDescs == [] ->
@@ -294,7 +294,7 @@ register_commands(CmdDescs, Module, Function) ->
 
 register_commands(Host, CmdDescs, Module, Function) ->
     ets:insert(ejabberd_ctl_host_cmds,
-	       [{Host, Cmd, Desc} || {Cmd, Desc} <- CmdDescs]),
+	       [{{Host, Cmd}, Desc} || {Cmd, Desc} <- CmdDescs]),
     ejabberd_hooks:add(ejabberd_ctl_process, Host,
 		       Module, Function, 50),
     ok.
@@ -310,7 +310,7 @@ unregister_commands(CmdDescs, Module, Function) ->
 unregister_commands(Host, CmdDescs, Module, Function) ->
     lists:foreach(fun({Cmd, Desc}) ->
 			  ets:delete_object(ejabberd_ctl_host_cmds,
-					    {Host, Cmd, Desc})
+					    {{Host, Cmd}, Desc})
 		  end, CmdDescs),
     ejabberd_hooks:delete(ejabberd_ctl_process,
 			  Module, Function, 50),