Index: Slim/Web/Pages.pm
===================================================================
--- Slim/Web/Pages.pm	(revision 14132)
+++ Slim/Web/Pages.pm	(working copy)
@@ -295,10 +295,10 @@
 
 			next unless defined $comment && $comment !~ /^\s*$/;
 
-			if (!($comment =~ s!\b(http://[\-~A-Za-z0-9_/\.]+)!<a href=\"$1\" target=\"_blank\">$1</a>!igo)) {
+			if (!($comment =~ s!\b(http://[A-Za-z0-9\-_\.\!~*'();/?:@&=+$,]+)!<a href=\"$1\" target=\"_blank\">$1</a>!igo)) {
 
 				# handle emusic-type urls which don't have http://
-				$comment =~ s!\b(www\.[\-~A-Za-z0-9_/\.]+)!<a href=\"http://$1\" target=\"_blank\">$1</a>!igo;
+				$comment =~ s!\b(www\.[A-Za-z0-9\-_\.\!~*'();/?:@&=+$,]+)!<a href=\"http://$1\" target=\"_blank\">$1</a>!igo;
 			}
 
 			$params->{'comment'} .= $comment;
Index: HTML/EN/songinfo_details.html
===================================================================
--- HTML/EN/songinfo_details.html	(revision 14132)
+++ HTML/EN/songinfo_details.html	(working copy)
@@ -87,7 +87,7 @@
 	[% END %]
 		
 	[% IF comment %] 
-		[% item = comment | html; title = "COMMENT"; PROCESS songInfoItem %]
+		[% item = comment; title = "COMMENT"; PROCESS songInfoItem %]
 	[% END %]
 
 	[% IF itemobj.lyrics %]