diff --git a/tbsetup/named_setup.in b/tbsetup/named_setup.in
index 8f386d22f79f103ba5f34cb064f9b0f5e8072881..1fa8dd466b3842f129635d262e896987c16d124c 100644
--- a/tbsetup/named_setup.in
+++ b/tbsetup/named_setup.in
@@ -27,7 +27,7 @@ my $USERS	= "@USERNODE@";
 my $DISABLED    = "@DISABLE_NAMED_SETUP@";
 my $OURDOMAIN   = "@OURDOMAIN@";
 
-my $mapdir			= "/tmp/namedb";
+my $mapdir			= "/etc/namedb";
 my $mapfile			= "$mapdir/${OURDOMAIN}.db";
 my $mapfiletail			= "$mapfile.tail";
 my $mapfile_internal		= "$mapdir/${OURDOMAIN}.internal.db";
@@ -412,8 +412,6 @@ while (my $dirent = readdir(DIR)) {
 }
 closedir DIR;
 
-exit(0);
-
 #
 # This is better than HUPing the nameserver directly. Notet that we look
 # for a local port of named first.