diff --git a/mopidy/backends/local/translator.py b/mopidy/backends/local/translator.py
index 8855c1d6..51522ead 100644
--- a/mopidy/backends/local/translator.py
+++ b/mopidy/backends/local/translator.py
@@ -97,6 +97,7 @@ def _convert_mpd_data(data, tracks, music_dir):
     track_kwargs = {}
     album_kwargs = {}
     artist_kwargs = {}
+    albumartist_kwargs = {}
 
     if 'track' in data:
         album_kwargs['num_tracks'] = int(data['track'].split('/')[1])
@@ -104,6 +105,10 @@ def _convert_mpd_data(data, tracks, music_dir):
 
     if 'artist' in data:
         artist_kwargs['name'] = data['artist']
+        albumartist_kwargs['name'] = data['artist']
+
+    if 'albumartist' in data:
+        albumartist_kwargs['name'] = data['albumartist']
 
     if 'album' in data:
         album_kwargs['name'] = data['album']
@@ -120,6 +125,9 @@ def _convert_mpd_data(data, tracks, music_dir):
     if 'musicbrainz_artistid' in data:
         artist_kwargs['musicbrainz_id'] = data['musicbrainz_artistid']
 
+    if 'musicbrainz_albumartistid' in data:
+        albumartist_kwargs['musicbrainz_id'] = data['musicbrainz_albumartistid']
+
     if data['file'][0] == '/':
         path = data['file'][1:]
     else:
@@ -127,8 +135,11 @@ def _convert_mpd_data(data, tracks, music_dir):
 
     if artist_kwargs:
         artist = Artist(**artist_kwargs)
-        album_kwargs['artists'] = [artist]
         track_kwargs['artists'] = [artist]
+
+    if albumartist_kwargs:
+        albumartist = Artist(**albumartist_kwargs)
+        album_kwargs['artists'] = [albumartist]
     
     if album_kwargs:
         album = Album(**album_kwargs)
diff --git a/tests/backends/local/translator_test.py b/tests/backends/local/translator_test.py
index 9347db59..1a3a36b0 100644
--- a/tests/backends/local/translator_test.py
+++ b/tests/backends/local/translator_test.py
@@ -149,4 +149,11 @@ class MPDTagCacheToTracksTest(unittest.TestCase):
         self.assertEqual(track, list(tracks)[0])
 
     def test_albumartist_tag_cache(self):
-        raise SkipTest
+        tracks = parse_mpd_tag_cache(data_folder('albumartist_tag_cache'),
+            data_folder(''))
+        uri = path_to_uri(data_folder('song1.mp3'))
+        artist = Artist(name='albumartistname')
+        album = expected_albums[0].copy(artists=[artist])
+        track = Track(name='trackname', artists=expected_artists, track_no=1,
+            album=album, length=4000, uri=uri)
+        self.assertEqual(track, list(tracks)[0])
diff --git a/tests/data/albumartist_tag_cache b/tests/data/albumartist_tag_cache
new file mode 100644
index 00000000..29942a75
--- /dev/null
+++ b/tests/data/albumartist_tag_cache
@@ -0,0 +1,16 @@
+info_begin
+mpd_version: 0.14.2
+fs_charset: UTF-8
+info_end
+songList begin
+key: song1.mp3
+file: /song1.mp3
+Time: 4
+Artist: name
+Title: trackname
+Album: albumname
+AlbumArtist: albumartistname
+Track: 1/2
+Date: 2006
+mtime: 1272319626
+songList end