diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index d91fc00cff..f01e1dcd84 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -258,12 +258,26 @@
                                     </div>
                                     <a id="btnOpenImdb" href="#" target="_blank" data-icon="arrow-r" data-inline="true" data-iconpos="notext" data-role="button" style="vertical-align: top;"></a>
                                 </div>
-                                <div data-role="fieldcontain" id="fldMusicBrainz" style="display: none;">
-                                    <label for="txtMusicBrainz">MusicBrainz Id:</label>
+                                <div data-role="fieldcontain" id="fldMusicBrainzArtistId" style="display: none;">
+                                    <label for="txtMusicBrainzArtistId">MusicBrainz Artist Id:</label>
                                     <div style="display: inline-block; width: 250px;">
-                                        <input class="txtProviderId" id="txtMusicBrainz" name="txtMusicBrainz" data-mini="true" />
+                                        <input class="txtProviderId" id="txtMusicBrainzArtistId" name="txtMusicBrainzArtistId" data-mini="true" />
                                     </div>
-                                    <a id="btnOpenMusicbrainz" href="#" target="_blank" data-icon="arrow-r" data-inline="true" data-iconpos="notext" data-role="button" style="vertical-align: top;"></a>
+                                    <a id="btnOpenMusicBrainzArtist" href="#" target="_blank" data-icon="arrow-r" data-inline="true" data-iconpos="notext" data-role="button" style="vertical-align: top;"></a>
+                                </div>
+                                <div data-role="fieldcontain" id="fldMusicBrainzAlbumArtistId" style="display: none;">
+                                    <label for="txtMusicBrainzAlbumArtistId">MusicBrainz Album Artist Id:</label>
+                                    <div style="display: inline-block; width: 250px;">
+                                        <input class="txtProviderId" id="txtMusicBrainzAlbumArtistId" name="txtMusicBrainzAlbumArtistId" data-mini="true" />
+                                    </div>
+                                    <a id="btnOpenMusicBrainzAlbumArtist" href="#" target="_blank" data-icon="arrow-r" data-inline="true" data-iconpos="notext" data-role="button" style="vertical-align: top;"></a>
+                                </div>
+                                <div data-role="fieldcontain" id="fldMusicBrainzAlbumId" style="display: none;">
+                                    <label for="txtMusicBrainzAlbumId">MusicBrainz Album Id:</label>
+                                    <div style="display: inline-block; width: 250px;">
+                                        <input class="txtProviderId" id="txtMusicBrainzAlbumId" name="txtMusicBrainzAlbumId" data-mini="true" />
+                                    </div>
+                                    <a id="btnOpenMusicBrainzAlbum" href="#" target="_blank" data-icon="arrow-r" data-inline="true" data-iconpos="notext" data-role="button" style="vertical-align: top;"></a>
                                 </div>
                                 <div data-role="fieldcontain" id="fldMusicBrainzReleaseGroupId" style="display: none;">
                                     <label for="txtMusicBrainzReleaseGroupId">MusicBrainz Release Group Id:</label>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 0629e0067f..98ba1527b9 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -678,7 +678,25 @@
             $('#fldMusicBrainz', page).hide();
         }
 
-        if (item.Type == "MusicAlbum") {
+        if (item.Type == "MusicAlbum" || item.Type == "Audio") {
+            $('#fldMusicBrainzAlbumId', page).show();
+        } else {
+            $('#fldMusicBrainzAlbumId', page).hide();
+        }
+
+        if (item.Type == "Audio") {
+            $('#fldMusicBrainzAlbumArtistId', page).show();
+        } else {
+            $('#fldMusicBrainzAlbumArtistId', page).hide();
+        }
+
+        if (item.Type == "MusicArtist" || item.Type == "Audio") {
+            $('#fldMusicBrainzArtistId', page).show();
+        } else {
+            $('#fldMusicBrainzArtistId', page).hide();
+        }
+
+        if (item.Type == "MusicAlbum" || item.Type == "Audio") {
             $('#fldMusicBrainzReleaseGroupId', page).show();
         } else {
             $('#fldMusicBrainzReleaseGroupId', page).hide();
@@ -963,7 +981,9 @@
         $('#txtTmdbCollection', page).val(providerIds.TmdbCollection || "");
         $('#txtTvdb', page).val(providerIds.Tvdb || "");
         $('#txtTvCom', page).val(providerIds.Tvcom || "");
-        $('#txtMusicBrainz', page).val(providerIds.Musicbrainz || "");
+        $('#txtMusicBrainzArtistId', page).val(providerIds.MusicBrainzArtist || "");
+        $('#txtMusicBrainzAlbumId', page).val(providerIds.MusicBrainzAlbum || "");
+        $('#txtMusicBrainzAlbumArtistId', page).val(providerIds.MusicBrainzAlbumArtist || "");
         $('#txtMusicBrainzReleaseGroupId', page).val(providerIds.MusicBrainzReleaseGroup || "");
         $('#txtRottenTomatoes', page).val(providerIds.RottenTomatoes || "");
         $('#txtZap2It', page).val(providerIds.Zap2It || "");
@@ -1210,7 +1230,9 @@
                     TmdbCollection: $('#txtTmdbCollection', form).val(),
                     Tvdb: $('#txtTvdb', form).val(),
                     Tvcom: $('#txtTvCom', form).val(),
-                    Musicbrainz: $('#txtMusicBrainz', form).val(),
+                    MusicBrainzAlbum: $('#txtMusicBrainzAlbumId', form).val(),
+                    MusicBrainzAlbumArtist: $('#txtMusicBrainzAlbumArtistId', form).val(),
+                    MusicBrainzArtist: $('#txtMusicBrainzArtistId', form).val(),
                     MusicBrainzReleaseGroup: $('#txtMusicBrainzReleaseGroupId', form).val(),
                     RottenTomatoes: $('#txtRottenTomatoes', form).val(),
                     Zap2It: $('#txtZap2It', form).val(),
@@ -1366,20 +1388,44 @@
 
         });
 
-        $('#txtMusicBrainz', this).on('change', function () {
+        $('#txtMusicBrainzAlbumId', this).on('change', function () {
 
             var val = this.value;
 
             if (val) {
 
-                if (currentItem.Type == "MusicArtist") {
-                    $('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/artist/' + val);
-                } else {
-                    $('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/release/' + val);
-                }
+                $('#btnOpenMusicBrainzAlbum', page).attr('href', 'http://musicbrainz.org/release/' + val);
 
             } else {
-                $('#btnOpenMusicbrainz', page).attr('href', '#');
+                $('#btnOpenMusicBrainzAlbum', page).attr('href', '#');
+            }
+
+        });
+
+        $('#txtMusicBrainzAlbumArtistId', this).on('change', function () {
+
+            var val = this.value;
+
+            if (val) {
+
+                $('#btnOpenMusicBrainzAlbumArtist', page).attr('href', 'http://musicbrainz.org/artist/' + val);
+
+            } else {
+                $('#btnOpenMusicBrainzAlbumArtist', page).attr('href', '#');
+            }
+
+        });
+
+        $('#txtMusicBrainzArtistId', this).on('change', function () {
+
+            var val = this.value;
+
+            if (val) {
+
+                $('#btnOpenMusicBrainzArtist', page).attr('href', 'http://musicbrainz.org/artist/' + val);
+
+            } else {
+                $('#btnOpenMusicBrainzArtist', page).attr('href', '#');
             }
 
         });
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 7f45b0b16d..9d20748e74 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1363,13 +1363,19 @@
                 else if (item.Type == "Person")
                     links.push('<a class="textlink" href="http://www.tv.com/people/' + providerIds.Tvcom + '" target="_blank">TV.com</a>');
             }
-            if (providerIds.Musicbrainz) {
+            if (providerIds.MusicBrainzAlbum) {
 
-                if (item.Type == "MusicArtist") {
-                    links.push('<a class="textlink" href="http://musicbrainz.org/artist/' + providerIds.Musicbrainz + '" target="_blank">MusicBrainz</a>');
-                } else {
-                    links.push('<a class="textlink" href="http://musicbrainz.org/release/' + providerIds.Musicbrainz + '" target="_blank">MusicBrainz Release</a>');
-                }
+                links.push('<a class="textlink" href="http://musicbrainz.org/release/' + providerIds.MusicBrainzAlbum + '" target="_blank">MusicBrainz Album</a>');
+
+            }
+            if (providerIds.MusicBrainzAlbumArtist) {
+
+                links.push('<a class="textlink" href="http://musicbrainz.org/artist/' + providerIds.MusicBrainzAlbumArtist + '" target="_blank">MusicBrainz Album Artist</a>');
+
+            }
+            if (providerIds.MusicBrainzArtist) {
+
+                links.push('<a class="textlink" href="http://musicbrainz.org/artist/' + providerIds.MusicBrainzArtist + '" target="_blank">MusicBrainz Artist</a>');
 
             }
             if (providerIds.MusicBrainzReleaseGroup) {