diff --git a/admin-root/config.html b/admin-root/config.html
index 12aae780..76c46155 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -24,6 +24,10 @@ take effect.
 	  <TD>MP3 Dir</TD>
 	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="MP3_DIR" SIZE="80" VALUE="@MP3_DIR@"></TD>
 	</TR>
+	<TR>
+	  <TD>Database Dir</TD>
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="DB_DIR" SIZE="80" VALUE="@DB_DIR@"></TD>
+	</TR>
 	<TR>
 	  <TD>Port</TD>
 	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="PORT" VALUE="@PORT@"></TD>
diff --git a/src/main.c b/src/main.c
index b9301f55..0ba7a25a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -473,7 +473,7 @@ int main(int argc, char *argv[]) {
     DPRINTF(ERR_DEBUG,"Initializing database\n");
 
     /* Initialize the database before starting */
-    if(db_init("none")) {
+    if(db_init(config.dbdir)) {
 	perror("db_init");
 	exit(EXIT_FAILURE);
     }