diff --git a/src/configfile.c b/src/configfile.c
index 5fe19646..2e215999 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -77,6 +77,7 @@ CONFIGELEMENT config_elements[] = {
     { 1,1,0,CONFIG_TYPE_STRING,"admin_pw",(void*)&config.adminpassword,config_emit_string },
     { 1,1,0,CONFIG_TYPE_STRING,"mp3_dir",(void*)&config.mp3dir,config_emit_string },
     { 1,1,0,CONFIG_TYPE_STRING,"servername",(void*)&config.servername,config_emit_string },
+    { 1,0,0,CONFIG_TYPE_STRING,"playlist",(void*)&config.playlist,config_emit_string },
     { 0,0,0,CONFIG_TYPE_SPECIAL,"release",(void*)VERSION,config_emit_literal },
     { 0,0,0,CONFIG_TYPE_SPECIAL,"package",(void*)PACKAGE,config_emit_literal },
     { 0,0,0,CONFIG_TYPE_SPECIAL,"include",(void*)NULL,config_emit_include },
@@ -138,6 +139,7 @@ int config_read(char *file) {
     config.adminpassword=NULL;
     config.readpassword=NULL;
     config.mp3dir=NULL;
+    config.playlist=NULL;
     config.servername="mt-daapd " VERSION;
 
     while(fgets(buffer,MAX_LINE,fin)) {
diff --git a/src/daapd.h b/src/daapd.h
index e27d29ea..2e3db601 100644
--- a/src/daapd.h
+++ b/src/daapd.h
@@ -40,6 +40,7 @@ typedef struct tag_config {
     char *readpassword;
     char *mp3dir;
     char *servername;
+    char *playlist;
 
     SONGENTRY songlist;
 } CONFIG;
diff --git a/src/mt-daapd.conf b/src/mt-daapd.conf
index d23f73fa..e0a8735c 100644
--- a/src/mt-daapd.conf
+++ b/src/mt-daapd.conf
@@ -3,4 +3,5 @@ port		3689
 admin_pw	secret
 mp3_dir		mp3
 servername	Ron's Secret Stash
+playlist	mt-daapd.playlist