diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m
index 948ed20ea..a776480a2 100755
--- a/Playlist/PlaylistLoader.m
+++ b/Playlist/PlaylistLoader.m
@@ -227,13 +227,22 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
         [dict release];
 	}
     
-    NSDictionary * dictionary = [NSDictionary dictionaryWithObjectsAndKeys:albumArtSet, @"albumArt", topLevel, @"items", nil];
+    NSMutableArray * queueList = [[NSMutableArray alloc] init];
+    
+    for (PlaylistEntry *pe in [playlistController queueList])
+    {
+        [queueList addObject:[NSNumber numberWithInt:pe.index]];
+    }
+    
+    NSDictionary * dictionary = [NSDictionary dictionaryWithObjectsAndKeys:albumArtSet, @"albumArt", queueList, @"queue", topLevel, @"items", nil];
     
     NSData * data = [NSPropertyListSerialization dataWithPropertyList:dictionary format:NSPropertyListXMLFormat_v1_0 options:0 error:0];
 
     [albumArtSet release];
     
     [topLevel release];
+
+    [queueList release];
     
     [fileHandle writeData:data];
     
@@ -276,7 +285,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
 	NSMutableArray *containedURLs = [NSMutableArray array];
 	NSMutableArray *fileURLs = [NSMutableArray array];
 	NSMutableArray *validURLs = [NSMutableArray array];
-    NSArray *xmlURLs = nil;
+    NSDictionary *xmlData = nil;
 	
 	if (!urls)
 		return [NSArray array];
@@ -333,7 +342,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
 		}
         else if ([[[[url path] pathExtension] lowercaseString] isEqualToString:@"xml"])
         {
-            xmlURLs = [XmlContainer entriesForContainerURL:url];
+            xmlData = [XmlContainer entriesForContainerURL:url];
         }
 		else
 		{
@@ -378,14 +387,12 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
 	
 	//Create actual entries
     int count = [validURLs count];
-    if (xmlURLs) count += [xmlURLs count];
+    if (xmlData) count += [[xmlData objectForKey:@"entries"] count];
     
-	int i;
+	int i = 0;
 	NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count];
-	for (i = 0; i < [validURLs count]; i++)
+	for (NSURL *url in validURLs)
 	{
-		NSURL *url = [validURLs objectAtIndex:i];
-		
 		PlaylistEntry *pe;
 		if ([url isFileURL]) 
 			pe = [[FilePlaylistEntry alloc] init];
@@ -399,30 +406,55 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
 		[entries addObject:pe];
 
 		[pe release];
+        
+        ++i;
 	}
+
+    int j = index + i;
     
-    for (i = 0; i < [xmlURLs count]; i++)
+    if (xmlData)
     {
-        NSDictionary * entry = [xmlURLs objectAtIndex:i];
-        
-        PlaylistEntry *pe;
-        if ([[entry objectForKey:@"URL"] isFileURL])
-            pe = [[FilePlaylistEntry alloc] init];
-        else
-            pe = [[PlaylistEntry alloc] init];
-        
-        [pe setValuesForKeysWithDictionary:entry];
-        pe.index = index+i+[validURLs count];
-        pe.queuePosition = -1;
-        [entries addObject:pe];
-        
-        [pe release];
+        for (NSDictionary *entry in [xmlData objectForKey:@"entries"])
+        {
+            PlaylistEntry *pe;
+            if ([[entry objectForKey:@"URL"] isFileURL])
+                pe = [[FilePlaylistEntry alloc] init];
+            else
+                pe = [[PlaylistEntry alloc] init];
+            
+            [pe setValuesForKeysWithDictionary:entry];
+            pe.index = index+i;
+            pe.queuePosition = -1;
+            [entries addObject:pe];
+            
+            [pe release];
+            
+            ++i;
+        }
     }
 	
 	NSIndexSet *is = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(index, [entries count])];
 	
 	[playlistController insertObjects:entries atArrangedObjectIndexes:is];
-	
+
+	if (xmlData && [[xmlData objectForKey:@"queue"] count])
+    {
+        [playlistController emptyQueueList:self];
+        
+        i = 0;
+        for (NSNumber *index in [xmlData objectForKey:@"queue"])
+        {
+            int indexVal = [index intValue] + j;
+            PlaylistEntry *pe = [entries objectAtIndex:indexVal];
+            pe.queuePosition = i;
+            pe.queued = YES;
+            
+            [[playlistController queueList] addObject:pe];
+            
+            ++i;
+        }
+    }
+    
 	//Select the first entry in the group that was just added
 	[playlistController setSelectionIndex:index];
 	[self performSelectorInBackground:@selector(loadInfoForEntries:) withObject:entries];
diff --git a/Playlist/XmlContainer.h b/Playlist/XmlContainer.h
index 057c1b945..9d1420294 100644
--- a/Playlist/XmlContainer.h
+++ b/Playlist/XmlContainer.h
@@ -14,6 +14,6 @@
 
 + (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename;
 
-+ (NSArray *)entriesForContainerURL:(NSURL *)url;
++ (NSDictionary *)entriesForContainerURL:(NSURL *)url;
 
 @end
diff --git a/Playlist/XmlContainer.m b/Playlist/XmlContainer.m
index 8517798fd..e7e325020 100644
--- a/Playlist/XmlContainer.m
+++ b/Playlist/XmlContainer.m
@@ -54,7 +54,7 @@
 	return url;
 }
 
-+ (NSArray *)entriesForContainerURL:(NSURL *)url
++ (NSDictionary *)entriesForContainerURL:(NSURL *)url
 {
 	if (![url isFileURL]) 
 		return [NSArray array];
@@ -84,12 +84,13 @@
     
     NSArray * items = (isArray) ? (NSArray*)plist : [(NSDictionary *)plist objectForKey:@"items"];
 	
-    NSDictionary *entry;
     NSDictionary *albumArt = (isArray) ? nil : [(NSDictionary *)plist objectForKey:@"albumArt"];
-	NSEnumerator *e = [items objectEnumerator];
+
+    NSArray *queueList = (isArray) ? [NSArray array] : [(NSDictionary *)plist objectForKey:@"queue"];
+    
 	NSMutableArray *entries = [NSMutableArray array];
 	
-	while ((entry = [e nextObject]))
+    for (NSDictionary *entry in items)
 	{
         NSMutableDictionary * preparedEntry = [NSMutableDictionary dictionaryWithDictionary:entry];
         
@@ -100,8 +101,8 @@
         
         [entries addObject:[NSDictionary dictionaryWithDictionary:preparedEntry]];
 	}
-	
-	return entries;
+    
+	return [NSDictionary dictionaryWithObjectsAndKeys:entries, @"entries", queueList, @"queue", nil];
 }
 
 @end