diff --git a/admin-root/config.html b/admin-root/config.html
index 8de4b16c..6d6edad9 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -56,6 +56,11 @@ take effect.
 	  <TD>Rescan Interval</TD>
 	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="RESCAN_INTERVAL" VALUE="@RESCAN_INTERVAL@"></TD>
 	</TR>
+	<TR>
+	  <TD>Process .m3u Files</TD>
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="PROCESS_M3U" VALUE="@PROCESS_M3U@"></TD>
+	</TR>
+
       </TABLE>
       <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Submit">
     </FORM>
diff --git a/configure.in b/configure.in
index deed095d..c3673063 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(config.h.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mt-daapd,0.2.1-cvs)
+AM_INIT_AUTOMAKE(mt-daapd,0.2.1-pre1)
 
 dnl Checks for programs.
 AC_PROG_CC
diff --git a/debian/changelog b/debian/changelog
index 9636c6c2..74722879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mt-daapd (0.2.1-pre1) unstable; urgency=low
+  * Add support for background filesystem scans
+  * More aac and id3 tags
+  * Various bug fixes
+
+ -- Ron Pedde <ron@pedde.com>  Sat, 23 Oct 2004 19:10:00 -0500
+
 mt-daapd (0.2.0) unstable; urgency=low
   * Add gdbm database
   * Add support for .m4a and .m4p
diff --git a/src/configfile.c b/src/configfile.c
index f03493a0..c11bcdc7 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -95,6 +95,7 @@ CONFIGELEMENT config_elements[] = {
 #endif
     { 1,1,0,CONFIG_TYPE_STRING,"servername",(void*)&config.servername,config_emit_string },
     { 1,0,0,CONFIG_TYPE_INT,"rescan_interval",(void*)&config.rescan_interval,config_emit_int },
+    { 1,0,0,CONFIG_TYPE_INT,"process_m3u",(void*)&config.rescan_interval,config_emit_int },
     { 1,0,0,CONFIG_TYPE_STRING,"playlist",(void*)&config.playlist,config_emit_string },
     { 1,0,0,CONFIG_TYPE_STRING,"extensions",(void*)&config.extensions,config_emit_string },
     { 1,0,0,CONFIG_TYPE_STRING,"password",(void*)&config.readpassword, config_emit_string },
@@ -169,6 +170,7 @@ int config_read(char *file) {
     config.artfilename=NULL;
     config.logfile=NULL;
     config.rescan_interval=0;
+    config.process_m3u=0;
 
     /* DWB: use alloced space so it can be freed without errors */
     config.extensions=strdup(".mp3");
@@ -312,6 +314,7 @@ int config_write(WS_CONNINFO *pwsc) {
     fprintf(configfile,"extensions\t%s\n",ws_getvar(pwsc,"extensions"));
     fprintf(configfile,"db_dir\t\t%s\n",ws_getvar(pwsc,"db_dir"));
     fprintf(configfile,"rescan_interval\t%s\n",ws_getvar(pwsc,"rescan_interval"));
+    fprintf(configfile,"process_m3u\t%s\n",ws_getvar(pwsc,"process_m3u"));    
 
     fclose(configfile);
     return 0;
diff --git a/src/daapd.h b/src/daapd.h
index 754bbac2..a1073e84 100644
--- a/src/daapd.h
+++ b/src/daapd.h
@@ -38,6 +38,7 @@ typedef struct tag_config {
     char *web_root;
     int port;
     int rescan_interval;
+    int process_m3u;
     char *adminpassword;
     char *readpassword;
     char *mp3dir;
diff --git a/src/mp3-scanner.c b/src/mp3-scanner.c
index e31b7c35..fc2f43d3 100644
--- a/src/mp3-scanner.c
+++ b/src/mp3-scanner.c
@@ -366,7 +366,8 @@ int scan_path(char *path) {
 	    } else {
 		/* process the file */
 		if(strlen(pde->d_name) > 4) {
-		    if(strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) {
+		    if((strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) &&
+		       config.process_m3u){
 			/* we found an m3u file */
 			scan_static_playlist(path, pde, &sb);
 		    } else if (strcasestr(config.extensions,