diff --git a/src/daap.c b/src/daap.c
index b3cdb7cf..9446bd42 100644
--- a/src/daap.c
+++ b/src/daap.c
@@ -32,6 +32,7 @@
 #include "daap-proto.h"
 #include "daap.h"
 #include "err.h"
+#include "daapd.h"
 
 typedef struct tag_daap_items {
     int type;
@@ -258,8 +259,15 @@ DAAP_BLOCK *daap_response_songlist(void) {
 
 		    // g = g && daap_add_char(mlit,"asco",0x0); /* compilation */
 		    // g = g && daap_add_string(mlit,"ascp",""); /* composer */
-		    // g = g && daap_add_int(mlit,"asda",0); /* date added */
-		    // g = g && daap_add_int(mlit,"asdm",0); /* date modified */
+
+		    if(current->ctime) {
+			g = g && daap_add_int(mlit,"asda",current->ctime); /* added */
+		    }
+
+		    if(current->mtime) {
+			g = g && daap_add_int(mlit,"asdm",current->mtime); /* modified */
+		    }
+
 		    // g = g && daap_add_short(mlit,"asdc",0); /* # of discs */
 		    // g = g && daap_add_short(mlit,"asdn",0); /* disc number */
 		    // g = g && daap_add_char(mlit,"asdk",0); /* song datakind? */
@@ -485,7 +493,7 @@ DAAP_BLOCK *daap_response_server_info(char *name) {
 	g = g && daap_add_int(root,"mpro",2 << 16); /* dmap proto ? */
 	g = g && daap_add_int(root,"apro",2 << 16); /* daap protocol */
 	g = g && daap_add_string(root,"minm",name); /* server name */
-	g = g && daap_add_char(root,"mslr",0); /* logon required */
+	g = g && daap_add_char(root,"mslr",config.readpassword != NULL); /* logon required */
 	g = g && daap_add_int(root,"mstm",1800); /* timeout  - iTunes=1800 */
 	g = g && daap_add_char(root,"msal",0); /* autologout */
 	g = g && daap_add_char(root,"msup",1); /* update */
diff --git a/src/mp3-scanner.c b/src/mp3-scanner.c
index d80de1d7..7a5dd7b4 100644
--- a/src/mp3-scanner.c
+++ b/src/mp3-scanner.c
@@ -346,6 +346,10 @@ int scan_foreground(char *path) {
 		    mp3file.path=mp3_path;
 		    mp3file.fname=de.d_name;
 
+		    mp3file.mtime=sb.st_mtimespec.tv_sec;
+		    mp3file.atime=sb.st_atimespec.tv_sec;
+		    mp3file.ctime=sb.st_ctimespec.tv_sec;
+
 		    /* FIXME; assumes that st_ino is a u_int_32 */
 		    mp3file.id=sb.st_ino;
 		    
diff --git a/src/mp3-scanner.h b/src/mp3-scanner.h
index 58ad17d0..d32633b1 100644
--- a/src/mp3-scanner.h
+++ b/src/mp3-scanner.h
@@ -37,6 +37,10 @@ typedef struct tag_mp3file {
     int file_size;
     int year;
 
+    int mtime;
+    int atime;
+    int ctime;
+
     int got_id3;
     unsigned int id;
 } MP3FILE;