diff -Nru mpd-0.12.1_orig/src/conf.c mpd-0.12.1/src/conf.c
--- mpd-0.12.1_orig/src/conf.c	2006-10-11 01:56:58.000000000 +0200
+++ mpd-0.12.1/src/conf.c	2007-03-21 22:31:51.000000000 +0100
@@ -173,6 +173,8 @@
 	registerConfigParam(CONF_ID3V1_ENCODING,                0,     0);
 	registerConfigParam(CONF_METADATA_TO_USE,               0,     0);
 	registerConfigParam(CONF_SAVE_ABSOLUTE_PATHS,           0,     0);
+	registerConfigParam(CONF_AUTO_PLAY,                     0,     0);
+	registerConfigParam(CONF_AUTO_REMOVE,                   0,     0);
 }
 
 static void addBlockParam(ConfigParam * param, char *name, char *value,
diff -Nru mpd-0.12.1_orig/src/conf.h mpd-0.12.1/src/conf.h
--- mpd-0.12.1_orig/src/conf.h	2006-10-11 01:56:58.000000000 +0200
+++ mpd-0.12.1/src/conf.h	2007-03-21 22:34:18.000000000 +0100
@@ -59,6 +59,8 @@
 #define CONF_ID3V1_ENCODING             "id3v1_encoding"
 #define CONF_METADATA_TO_USE            "metadata_to_use"
 #define CONF_SAVE_ABSOLUTE_PATHS        "save_absolute_paths_in_playlists"
+#define CONF_AUTO_PLAY                  "auto_play"
+#define CONF_AUTO_REMOVE                "auto_remove"
 
 typedef struct _BlockParam {
 	char *name;
diff -Nru mpd-0.12.1_orig/src/playlist.c mpd-0.12.1/src/playlist.c
--- mpd-0.12.1_orig/src/playlist.c	2006-10-11 01:56:58.000000000 +0200
+++ mpd-0.12.1/src/playlist.c	2007-03-22 01:05:19.878450151 +0100
@@ -64,6 +64,9 @@
 #define DEFAULT_PLAYLIST_MAX_LENGTH		(1024*16)
 #define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS	0
 
+#define DEFAULT_AUTO_PLAY	0
+#define DEFAULT_AUTO_REMOVE	0
+
 typedef struct _Playlist {
 	Song **songs;
 	/* holds version a song was modified on */
@@ -88,6 +91,8 @@
 static int playlist_noGoToNext = 0;
 
 static int playlist_saveAbsolutePaths = DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS;
+static int playlist_autoPlay = DEFAULT_AUTO_PLAY;
+static int playlist_autoRemove = DEFAULT_AUTO_REMOVE;
 
 static void swapOrder(int a, int b);
 static int playPlaylistOrderNumber(int fd, int orderNum);
@@ -161,6 +166,14 @@
 	if (playlist_saveAbsolutePaths == -1) playlist_saveAbsolutePaths = 0;
 	else if (playlist_saveAbsolutePaths < 0) exit(EXIT_FAILURE);
 
+	playlist_autoPlay = getBoolConfigParam(CONF_AUTO_PLAY);
+	if (playlist_autoPlay == -1) playlist_autoPlay = 0;
+	else if (playlist_autoPlay < 0) exit(EXIT_FAILURE);
+
+	playlist_autoRemove = getBoolConfigParam(CONF_AUTO_REMOVE);
+	if (playlist_autoRemove == -1) playlist_autoRemove = 0;
+	else if (playlist_autoRemove < 0) exit(EXIT_FAILURE);
+
 	playlist.songs = xmalloc(sizeof(Song *) * playlist_max_length);
 	playlist.songMod = xmalloc(sizeof(mpd_uint32) * playlist_max_length);
 	playlist.order = xmalloc(sizeof(int) * playlist_max_length);
@@ -538,8 +551,14 @@
 			playlist.current = playlist.queued;
 		}
 		playlist.queued = -1;
+		if (playlist_autoRemove)
+			deleteFromPlaylist(STDERR_FILENO, 0);
 		if (queue)
 			queueNextSongInPlaylist();
+	} else if (playlist_autoRemove && getPlayerQueueState() == 
+							PLAYER_QUEUE_BLANK) {
+		// this is for the last playlist item
+		deleteFromPlaylist(STDERR_FILENO, 0);
 	}
 }
 
@@ -619,6 +638,11 @@
 	    playlist.length;
 	playlist.length++;
 
+	if (playlist_autoPlay && (playlist.length == 1))
+	{
+		playPlaylistOrderNumber(fd, 0);
+	}
+
 	if (playlist.random) {
 		int swap;
 		int start;