diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html
index 1e38f419..55cc1dd5 100644
--- a/data/interfaces/default/album.html
+++ b/data/interfaces/default/album.html
@@ -26,8 +26,8 @@
 		<h2><a href="artistPage?ArtistID=${album['ArtistID']}"><- Back to ${album['ArtistName']}</a></h2>
 		<div id="albumheader">	
 			<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.LZZZZZZZ.jpg" height="200" width="200" alt="albumart" class="albumArt">
-			<h1>${album['AlbumTitle']}</h1>
-			<h2>${album['ArtistName']}</h2>
+			<h1><a href="http://musicbrainz.org/release-group/${album['AlbumID']}">${album['AlbumTitle']}</a></h1>
+			<h2><a href="http://musicbrainz.org/artist/${album['ArtistID']}">${album['ArtistName']}</a></h2>
 			<br>
 			<%
 				totalduration = myDB.action("SELECT SUM(TrackDuration) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0]
diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html
index 164658a2..a063e0e9 100644
--- a/data/interfaces/default/artist.html
+++ b/data/interfaces/default/artist.html
@@ -24,7 +24,7 @@
 
 <%def name="body()">
 	<div id="paddingheader">
-		<h1>${artist['ArtistName']}<h1>
+		<h1><a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a><h1>
 		%if artist['Status'] == 'Loading':
 		<h3><i>(Album information for this artist is currently being loaded)</i></h3>
 		%endif		
diff --git a/data/interfaces/remix/album.html b/data/interfaces/remix/album.html
index 1e38f419..55cc1dd5 100644
--- a/data/interfaces/remix/album.html
+++ b/data/interfaces/remix/album.html
@@ -26,8 +26,8 @@
 		<h2><a href="artistPage?ArtistID=${album['ArtistID']}"><- Back to ${album['ArtistName']}</a></h2>
 		<div id="albumheader">	
 			<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.LZZZZZZZ.jpg" height="200" width="200" alt="albumart" class="albumArt">
-			<h1>${album['AlbumTitle']}</h1>
-			<h2>${album['ArtistName']}</h2>
+			<h1><a href="http://musicbrainz.org/release-group/${album['AlbumID']}">${album['AlbumTitle']}</a></h1>
+			<h2><a href="http://musicbrainz.org/artist/${album['ArtistID']}">${album['ArtistName']}</a></h2>
 			<br>
 			<%
 				totalduration = myDB.action("SELECT SUM(TrackDuration) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0]
diff --git a/data/interfaces/remix/artist.html b/data/interfaces/remix/artist.html
index fced33c4..87d675a6 100644
--- a/data/interfaces/remix/artist.html
+++ b/data/interfaces/remix/artist.html
@@ -24,7 +24,7 @@
 
 <%def name="body()">
 	<div id="paddingheader">
-		<h1>${artist['ArtistName']}<h1>
+		<h1><a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a><h1>
 		%if artist['Status'] == 'Loading':
 		<h3><i>(Album information for this artist is currently being loaded)</i></h3>
 		%endif