diff --git a/CHANGELOG b/CHANGELOG
index b1902ec7..7a2fdbd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 [UNRELEASED]
+  Improvements:
+   - Added "Album Artist / Album" to Library Grouping
   Bugfixes:
    - Make connection to Clementine more robust
    - Fix crash when mSocket.getInetAddress() is null
diff --git a/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java b/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java
index c301032e..3b6e8062 100644
--- a/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java
+++ b/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java
@@ -32,6 +32,9 @@ protected String[] getSelectedFields() {
             case "artist-album":
                 selectedFields = new String[] {"artist", "album", "title"};
                 break;
+            case "albumartist-album":
+                selectedFields = new String[] {"albumartist", "album", "title"};
+                break;
             case "artist-year":
                 selectedFields = new String[] {"artist", "year", "title"};
                 break;
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index a7bde7a4..d0ad2000 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -71,6 +71,7 @@
     <string-array name="pref_library_grouping_values">
         <item>artist</item>
         <item>artist-album</item>
+        <item>albumartist-album</item>
         <item>artist-year</item>
         <item>album</item>
         <item>genre-album</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55a8985c..1ed9dfd0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,6 +156,7 @@
     <string-array name="pref_library_grouping">
         <item>Artist</item>
         <item>Artist / Album</item>
+        <item>Album Artist / Album</item>
         <item>Artist / Year</item>
         <item>Album</item>
         <item>Genre / Album</item>