diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py
index 48c8fe30..0073c113 100644
--- a/mopidy/frontends/mpd/translator.py
+++ b/mopidy/frontends/mpd/translator.py
@@ -43,10 +43,15 @@ def track_to_mpd_format(track, position=None, cpid=None):
         result.append(('Id', cpid))
     if track.album is not None and track.album.musicbrainz_id is not None:
         result.append(('MUSICBRAINZ_ALBUMID', track.album.musicbrainz_id))
+    # FIXME don't use first and best artist?
+    # FIXME don't duplicate following code?
+    if track.album is not None and track.album.artists:
+        artists = filter(lambda a: a.musicbrainz_id is not None, track.album.artists)
+        if artists:
+            result.append(('MUSICBRAINZ_ALBUMARTISTID', artists[0].musicbrainz_id))
     if track.artists:
         artists = filter(lambda a: a.musicbrainz_id is not None, track.artists)
         if artists:
-            # FIXME don't use first and best artist?
             result.append(('MUSICBRAINZ_ARTISTID', artists[0].musicbrainz_id))
     if track.musicbrainz_id is not None:
         result.append(('MUSICBRAINZ_TRACKID', track.musicbrainz_id))
diff --git a/tests/frontends/mpd/serializer_test.py b/tests/frontends/mpd/serializer_test.py
index bc01d820..7e4500ea 100644
--- a/tests/frontends/mpd/serializer_test.py
+++ b/tests/frontends/mpd/serializer_test.py
@@ -78,6 +78,13 @@ class TrackMpdFormatTest(unittest.TestCase):
         result = translator.track_to_mpd_format(track)
         self.assert_(('MUSICBRAINZ_ALBUMID', 'foo') in result)
 
+    def test_track_to_mpd_format_musicbrainz_albumid(self):
+        artist = list(self.track.artists)[0].copy(musicbrainz_id='foo')
+        album = self.track.album.copy(artists=[artist])
+        track = self.track.copy(album=album)
+        result = translator.track_to_mpd_format(track)
+        self.assert_(('MUSICBRAINZ_ALBUMARTISTID', 'foo') in result)
+
     def test_track_to_mpd_format_musicbrainz_artistid(self):
         artist = list(self.track.artists)[0].copy(musicbrainz_id='foo')
         track = self.track.copy(artists=[artist])