diff --git a/doc/config b/doc/config
index 19e33510..25a98bdf 100644
--- a/doc/config
+++ b/doc/config
@@ -325,7 +325,7 @@
 ##
 #user_interface = classic
 #
-## Available values: artist, date, genre, composer, performer.
+## Available values: artist, album_artist, date, genre, composer, performer.
 ##
 #media_library_primary_tag = artist
 #
diff --git a/src/settings.cpp b/src/settings.cpp
index afc8d1e1..3109a635 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -388,6 +388,8 @@ bool Configuration::read(const std::string &config_path)
 	p.add("media_library_primary_tag", option_parser::worker([this](std::string &&v) {
 		if (v == "artist")
 			media_lib_primary_tag = MPD_TAG_ARTIST;
+		else if (v == "album_artist")
+			media_lib_primary_tag = MPD_TAG_ALBUM_ARTIST;
 		else if (v == "date")
 			media_lib_primary_tag = MPD_TAG_DATE;
 		else if (v == "genre")