--- plugins/ipod/rb-ipod-source.c.old	2008-02-28 12:16:39.000000000 +0100
+++ plugins/ipod/rb-ipod-source.c	2008-03-22 11:28:07.000000000 +0100
@@ -1627,8 +1627,8 @@
 	GList *ret = NULL;
 
 	/* FIXME: we should really query HAL for this */
-	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
 	ret = g_list_prepend (ret, g_strdup ("audio/mpeg"));
+	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
 
 	return ret;
 }

--- sources/rb-removable-media-source.c.old	2008-03-22 11:48:48.000000000 +0100
+++ sources/rb-removable-media-source.c	2008-03-22 11:49:15.000000000 +0100
@@ -314,6 +314,8 @@
 			/* if it has a bitrate, assume it's mp3-in-wav */
 			if (rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE) != 0)
 				entry_mime = "audio/mpeg";
+		} else if (strcmp (entry_mime, "audio/x-m4a") == 0) {
+			entry_mime = "audio/aac";
 		} else if (strcmp (entry_mime, "application/x-id3") == 0) {
 			entry_mime = "audio/mpeg";
 		} else if (strcmp (entry_mime, "audio/x-flac") == 0) {
