diff --git a/plugins/daap/rb-daap-share.c b/plugins/daap/rb-daap-share.c
index 3a9b8a9..7866eea 100644
--- a/plugins/daap/rb-daap-share.c
+++ b/plugins/daap/rb-daap-share.c
@@ -1030,6 +1030,9 @@ add_entry_to_mlcl (RhythmDBEntry *entry,
 			/* FIXME we should use RHYTHMDB_PROP_MIMETYPE instead */
 			ext = "mp3";
 			rb_daap_structure_add (mlit, RB_DAAP_CC_ASFM, ext);
+		} else if (strcmp (ext, ".flac") == 0) {
+			/* vague lies in the hope of getting itunes to play flac */
+			rb_daap_structure_add (mlit, RB_DAAP_CC_ASFM, "mov");
 		} else {
 			ext++;
 			rb_daap_structure_add (mlit, RB_DAAP_CC_ASFM, ext);
@@ -1464,6 +1467,7 @@ databases_cb (SoupServer        *server,
 		RhythmDBEntry *entry;
 		const gchar *location;
 		const gchar *range_header;
+		const gchar *mimetype;
 		guint64 file_size;
 		guint64 offset = 0;
 
@@ -1474,7 +1478,16 @@ databases_cb (SoupServer        *server,
 		location = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
 		file_size = rhythmdb_entry_get_uint64 (entry, RHYTHMDB_PROP_FILE_SIZE);
 
-		message_add_standard_headers (message);
+		/*message_add_standard_headers (message);*/
+		soup_message_headers_append (message->response_headers, "DAAP-Server", "Rhythmbox " VERSION);
+		mimetype = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MIMETYPE);
+		if (strcmp (mimetype, "audio/x-flac") == 0) {
+			/* more vague lies in the hope of getting itunes to play flac */
+			soup_message_headers_append (message->response_headers, "Content-Type", "audio/mp4");
+		} else {
+			soup_message_headers_append (message->response_headers, "Content-Type", mimetype);
+		}
+
 		soup_message_headers_append (message->response_headers, "Accept-Ranges", "bytes");
 
 		range_header = soup_message_headers_get (message->request_headers, "Range");
