Index: Slim/Web/Pages/Home.pm
===================================================================
--- Slim/Web/Pages/Home.pm	(revision 9695)
+++ Slim/Web/Pages/Home.pm	(working copy)
@@ -29,7 +29,7 @@
 	$class->addPageLinks("help",{'HELP_REMOTE' => "html/help_remote.html"});
 	$class->addPageLinks("help",{'HELP_RADIO' => "html/docs/radio.html"});
 	$class->addPageLinks("help",{'REMOTE_STREAMING' => "html/docs/remotestreaming.html"});
-	$class->addPageLinks("help",{'FAQ' => "http://faq.slimdevices.com/"});
+	$class->addPageLinks("help",{'FAQ' => "http://faq.slimdevices.com/"},1);
 	$class->addPageLinks("help",{'SOFTSQUEEZE' => "html/softsqueeze/index.html"});
 	$class->addPageLinks("help",{'TECHNICAL_INFORMATION' => "html/docs/index.html"});
 }
Index: HTML/Fishbone/home.html
===================================================================
--- HTML/Fishbone/home.html	(revision 9695)
+++ HTML/Fishbone/home.html	(working copy)
@@ -6,7 +6,7 @@
 	[% IF additionalLinks.help %]
 		[% FOREACH link = additionalLinks.help %]
 		<li>
-			<a href="[% link.value %]player=[% playerURI %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a>
+			<a href="[% link.value %][% IF NOT link.value.match('^http') %]player=[% playerURI %][% END %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a>
 		</li>
 		[% END %]
 		<li>
Index: HTML/Nokia770/home.html
===================================================================
--- HTML/Nokia770/home.html	(revision 9695)
+++ HTML/Nokia770/home.html	(working copy)
@@ -103,7 +103,7 @@
 	<div>[% "HELP" | string | upper %]</div>
 	<ul>
 	[%- FOREACH link = additionalLinks.help %]
-		<li><a href="[% link.value | html %]player=[% playerURI %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a></li>
+		<li><a href="[% link.value | html %][% IF NOT link.value.match('^http') %]player=[% playerURI %][% END %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a></li>
 	[%- END %]
 	</ul>
 </div>
Index: HTML/NBMU/home.html
===================================================================
--- HTML/NBMU/home.html	(revision 9695)
+++ HTML/NBMU/home.html	(working copy)
@@ -88,7 +88,7 @@
 [% IF additionalLinks.help %]
     [% FOREACH link = additionalLinks.help %]
     <li>
- 		<a href="[% link.value %]player=[% playerURI %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a>
+ 		<a href="[% link.value %][% IF NOT link.value.match('^http') %]player=[% playerURI %][% END %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
Index: HTML/EN/home.html
===================================================================
--- HTML/EN/home.html	(revision 9695)
+++ HTML/EN/home.html	(working copy)
@@ -86,7 +86,7 @@
 	<div>[% "HELP" | string | upper %]</div>
 	<ul>
 	[%- FOREACH link = additionalLinks.help %]
-		<li><a href="[% link.value | html %]player=[% playerURI %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a></li>
+		<li><a href="[% link.value | html %][% IF NOT link.value.match('^http') %]player=[% playerURI %][% END %]" [% IF link.value.match('^http') %]target="_new"[% END %]>[% link.key | string %]</a></li>
 	[%- END %]
 	</ul>
 </div>
Index: HTML/Handheld/home.html
===================================================================
--- HTML/Handheld/home.html	(revision 9695)
+++ HTML/Handheld/home.html	(working copy)
@@ -9,7 +9,7 @@
 	    	[% END %]
 		[% END %]
 		[% IF additionalmenu.text %]
-	   		<li><a href="[% additionalmenu.link %]?player=[% playerURI %]">[% additionalmenu.text | string %]</a></li>
+	   		<li><a href="[% additionalmenu.link %]?[% IF NOT additionalmenu.link.value.match('^http') %]player=[% playerURI %][% END %]">[% additionalmenu.text | string %]</a></li>
 		[% END %]
 		</ul>
 	[% END %]