diff --git a/etc/Makefile.am b/etc/Makefile.am
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,1 +1,1 @@
-sysconf_DATA = distrenclient.conf distrencommon.conf distrenserver.conf distrenslave.conf
+sysconf_DATA = distrenclient.conf distrencommon.conf distrendaemon.conf distrenslave.conf
diff --git a/etc/distrenserver.conf b/etc/distrendaemon.conf
rename from etc/distrenserver.conf
rename to etc/distrendaemon.conf
--- a/etc/distrenserver.conf
+++ b/etc/distrendaemon.conf
@@ -1,14 +1,14 @@
 /*
  configuration for _this_ server
 */
-me
+daemon
 {
+  datadir = "/var/lib/distren"
   render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
 }
 
 include("distrencommon.conf")
 
-datadir = "/var/lib/distren"
 
 listen {
        type = "unix"
diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -455,7 +455,7 @@ int distrend_do_config(int argc, char *a
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
 
-  options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
+  options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options);
 
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);