Index: server/Slim/Web/HTTP.pm
===================================================================
--- server/Slim/Web/HTTP.pm	(revision 29686)
+++ server/Slim/Web/HTTP.pm	(working copy)
@@ -384,6 +384,13 @@
 	# this bundles up all our response headers and content
 	my $response = HTTP::Response->new();
 
+	# all responses' Server header should include our Squeezebox Server version,
+	# and this version should be encode as per RFC 2616, http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.38
+	# e.g. "Server: Squeezebox Server/7.4.2-TRUNK"
+	# Note: responses denied with a 401 will get both the standard HTTP::Daemon string and the SBS string
+	# e.g. "Server: libwww-perl-daemon/1.36, Squeezebox Server/7.4.2-TRUNK"
+	$response->header('Server' => sprintf("Squeezebox Server/%s-%s", $::VERSION, $::REVISION) );
+
 	# by default, respond in kind.
 	$response->protocol($request->protocol());
 	$response->request($request);
@@ -1586,8 +1593,6 @@
 
 	$data .= sprintf("%s %s %s%s", $response->protocol(), $code, HTTP::Status::status_message($code) || "", $CRLF);
 
-	$data .= sprintf("Server: Squeezebox Server (%s - %s)%s", $::VERSION, $::REVISION, $CRLF);
-
 	$data .= $response->headers_as_string($CRLF);
 
 	# hack to make xmms like the audio better, since it appears to be case sensitive on for headers.