diff -r 73aacbf6e492 -r d680536f8c2f src/server/daemon/webserver.c
--- a/src/server/daemon/webserver.c	Mon Jan 16 14:06:52 2012 +0100
+++ b/src/server/daemon/webserver.c	Sat Jan 21 16:37:35 2012 +0100
@@ -35,6 +35,7 @@
 
 #include "func.h"
 #include "config.h"
+#include "configmanager.h"
 #include "httplistener.h"
 #include "webserver.h"
 
@@ -51,10 +52,14 @@
     add_functions(webserver_funcs);
 
     // load init.conf
-    load_init_conf(NULL);
+    load_init_conf("conf/init.conf");
 
     // load server.conf
-    load_server_conf(NULL);
+    init_configuration_manager();
+    if(cfgmgr_load_config() != 0) {
+        fprintf(stderr, "Cannot load configuration\n");
+        return -1;
+    }
 
     // init NSAPI functions