diff --git a/ChangeLog b/ChangeLog
index 9fa1f29e6..390023ea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-29  Mickael Remond  <mickael.remond@process-one.net>
+  	 	
+	* src/ejabberd_config.erl: Normalize hostnames in config file. If mixed
+  	 case is used, the hostname will be now useable (EJAB-277).
+	* src/stringprep/stringprep_sup.erl: Likewise
+	* src/stringprep/Makefile.in: Likewise
+	* src/stringprep/Makefile.win32: Likewise
+	* src/ejabberd_app.erl: Likewise
+	* src/ejabberd_sup.erl: Likewise
+
 2007-02-02  Christophe Romain <christophe.romain@process-one.net>
 
 	* doc/release_notes_1.1.3.txt: Creation.
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index c1ea274a2..0f912aa29 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -22,6 +22,7 @@ start(normal, _Args) ->
     db_init(),
     sha:start(),
     catch ssl:start(),
+    stringprep_sup:start_link(),    
     translate:start(),
     acl:start(),
     ejabberd_ctl:init(),
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 93aee3e19..1c7a76b14 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -63,7 +63,7 @@ search_hosts(Term, State) ->
 	{host, Host} ->
 	    if
 		State#state.hosts == [] ->
-		    add_option(hosts, [Host], State#state{hosts = [Host]});
+		    add_hosts_to_option([Host], State);
 		true ->
 		    ?ERROR_MSG("Can't load config file: "
 			       "too many hosts definitions", []),
@@ -72,7 +72,7 @@ search_hosts(Term, State) ->
 	{hosts, Hosts} ->
 	    if
 		State#state.hosts == [] ->
-		    add_option(hosts, Hosts, State#state{hosts = Hosts});
+		    add_hosts_to_option(Hosts, State);
 		true ->
 		    ?ERROR_MSG("Can't load config file: "
 			       "too many hosts definitions", []),
@@ -82,6 +82,24 @@ search_hosts(Term, State) ->
 	    State
     end.
 
+add_hosts_to_option(Hosts, State) ->
+    PrepHosts = normalize_hosts(Hosts),
+    add_option(hosts, PrepHosts, State#state{hosts = PrepHosts}).
+
+normalize_hosts(Hosts) ->
+    normalize_hosts(Hosts,[]).
+normalize_hosts([], PrepHosts) ->
+    lists:reverse(PrepHosts);
+normalize_hosts([Host|Hosts], PrepHosts) ->
+    case jlib:nodeprep(Host) of
+	error ->
+	    ?ERROR_MSG("Can't load config file: "
+		       "invalid host name [~p]", [Host]),
+	    exit("invalid hostname");
+	PrepHost ->
+	    normalize_hosts(Hosts, [PrepHost|PrepHosts])
+    end.
+
 process_term(Term, State) ->
     case Term of
 	override_global ->
diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl
index 1e6851dc2..beff6c561 100644
--- a/src/ejabberd_sup.erl
+++ b/src/ejabberd_sup.erl
@@ -26,13 +26,6 @@ init([]) ->
 	 brutal_kill,
 	 worker,
 	 [ejabberd_hooks]},
-    StringPrep =
-	{stringprep,
-	 {stringprep, start_link, []},
-	 permanent,
-	 brutal_kill,
-	 worker,
-	 [stringprep]},
     Router =
 	{ejabberd_router,
 	 {ejabberd_router, start_link, []},
@@ -133,7 +126,6 @@ init([]) ->
 	 [ejabberd_tmp_sup]},
     {ok, {{one_for_one, 10, 1},
 	  [Hooks,
-	   StringPrep,
 	   Router,
 	   SM,
 	   S2S,
diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in
index 2d858cc2e..cf66a5530 100644
--- a/src/stringprep/Makefile.in
+++ b/src/stringprep/Makefile.in
@@ -20,7 +20,8 @@ ERLSHLIBS = ../stringprep_drv.so
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
 OBJS   = \
-	$(OUTDIR)/stringprep.beam
+	$(OUTDIR)/stringprep.beam \
+	$(OUTDIR)/stringprep_sup.beam
 
 all:    $(OBJS) $(ERLSHLIBS)
 
diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32
index 37e806a1a..03d7a3dd5 100644
--- a/src/stringprep/Makefile.win32
+++ b/src/stringprep/Makefile.win32
@@ -9,7 +9,8 @@ AUXIL  = uni_data.c uni_norm.c
 OBJECT = stringprep_drv.o
 DLL    = $(OUTDIR)\stringprep_drv.dll
 
-ALL : $(DLL) $(OUTDIR)\stringprep.beam
+ALL : $(DLL) $(OUTDIR)\stringprep.beam \
+	$(OUTDIR)\stringprep_sup.beam
 
 CLEAN :
 	-@erase $(DLL)
@@ -17,10 +18,14 @@ CLEAN :
 	-@erase $(OUTDIR)\stringprep_drv.lib
 	-@erase $(OBJECT)
 	-@erase $(OUTDIR)\stringprep.beam
+	-@erase $(OUTDIR)\stringprep_sup.beam
 
 $(OUTDIR)\stringprep.beam : stringprep.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) stringprep.erl
 
+$(OUTDIR)\stringprep_sup.beam : stringprep_sup.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) stringprep_sup.erl
+
 CC=cl.exe
 CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include"
 
diff --git a/src/stringprep/stringprep_sup.erl b/src/stringprep/stringprep_sup.erl
new file mode 100644
index 000000000..e3b957965
--- /dev/null
+++ b/src/stringprep/stringprep_sup.erl
@@ -0,0 +1,49 @@
+%%%-------------------------------------------------------------------
+%%% File    : stringprep_sup.erl
+%%% Author  : Mickael Remond <mremond@process-one.net>
+%%% Description : Supervisor for the Stringprep worker.
+%%%
+%%% Created : 29 Jun 2007 by Mickael Remond <mremond@process-one.net>
+%%%-------------------------------------------------------------------
+-module(stringprep_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+-define(SERVER, ?MODULE).
+
+%%====================================================================
+%% API functions
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the supervisor
+%%--------------------------------------------------------------------
+start_link() ->
+    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+
+%%====================================================================
+%% Supervisor callbacks
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Func: init(Args) -> {ok,  {SupFlags,  [ChildSpec]}} |
+%%                     ignore                          |
+%%                     {error, Reason}
+%% Description: Whenever a supervisor is started using 
+%% supervisor:start_link/[2,3], this function is called by the new process 
+%% to find out about restart strategy, maximum restart frequency and child 
+%% specifications.
+%%--------------------------------------------------------------------
+init([]) ->
+    StringPrep = {stringprep,
+	      {stringprep, start_link, []},
+	      permanent,
+	      brutal_kill,
+	      worker,
+	      [stringprep]},
+    {ok,{{one_for_all,10,1}, [StringPrep]}}.