diff --git a/xmmslist.py b/xmmslist.py
index f0dd76e..c816c5d 100755
--- a/xmmslist.py
+++ b/xmmslist.py
@@ -53,7 +53,7 @@ songsearch='http://www.lyricsstation.com/search.asp?R1=V1&txtSearch='
 bandsearch='"http://www.google.com/search?cat=gwd%2FTop%2FArts%2FMusic&q='
 
 # The album search URL
-albumsearch='http://www.cduniverse.com/sresult.asp?HT_Search=TITLE&HT_Search_Info='
+albumsearch='http://www.freedb.org/freedb_search.php?allfields=NO&fields=artist&fields=title&allcats=YES&grouping=cats&words='
 
 
 if len(sys.argv) > 1:
@@ -89,7 +89,7 @@ if len(sys.argv) > 1:
 		
 		# Album
 		if len(m.group(3)) >= 1:
-			song += '<td><a href="' + albumsearch + urllib.quote_plus(m.group(3)) + '" target="_blank">' + cgi.escape(m.group(3)) + '</a></td>'
+			song += '<td><a href="' + albumsearch + urllib.quote_plus(m.group(1) + ' ' + m.group(3)) + '" target="_blank">' + cgi.escape(m.group(3)) + '</a></td>'
 		else:
 			song += '<td><font color="gray">n/a</font></td>'