diff --git a/api/get_music_directory.go b/api/get_music_directory.go
index 98195f0c3..1da4779ad 100644
--- a/api/get_music_directory.go
+++ b/api/get_music_directory.go
@@ -40,7 +40,7 @@ func (c *GetMusicDirectoryController) Get() {
 			dir.Child[i].IsDir = true
 			dir.Child[i].Album = al.Name
 			dir.Child[i].Year = al.Year
-			dir.Child[i].Artist = a.Name //TODO AlbumArtist
+			dir.Child[i].Artist = al.Artist
 			dir.Child[i].Genre = al.Genre
 		}
 	} else {
@@ -55,7 +55,7 @@ func (c *GetMusicDirectoryController) Get() {
 				dir.Child[i].IsDir = false
 				dir.Child[i].Album = mf.Album
 				dir.Child[i].Year = mf.Year
-				dir.Child[i].Artist = mf.AlbumArtist
+				dir.Child[i].Artist = mf.Artist
 				dir.Child[i].Genre = mf.Genre
 				dir.Child[i].Track = mf.Track
 				dir.Child[i].Duration = mf.Duration
diff --git a/domain/album.go b/domain/album.go
index dbf56152b..e0f98fda3 100644
--- a/domain/album.go
+++ b/domain/album.go
@@ -5,6 +5,8 @@ type Album struct {
 	Name         string
 	ArtistId     string `parent:"artist"`
 	CoverArtPath string // TODO http://stackoverflow.com/questions/13795842/linking-itunes-itc2-files-and-ituneslibrary-xml
+	Artist       string
+	AlbumArtist  string
 	Year         int
 	Compilation  bool
 	Rating       int
diff --git a/scanner/scanner.go b/scanner/scanner.go
index fc7826128..d93da92f3 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -88,6 +88,8 @@ func parseTrack(t *Track) (*domain.MediaFile, *domain.Album, *domain.Artist) {
 		Year:        t.Year,
 		Compilation: t.Compilation,
 		Genre:       t.Genre,
+		Artist:	     t.Artist,
+		AlbumArtist: t.AlbumArtist,
 	}
 
 	artist := &domain.Artist{