diff --git a/SOAP/Transport/HTTPng.pm b/SOAP/Transport/HTTPng.pm
index c3e027d9ab49699c09583589ac12d3b15a69f499..96b98b2d8098ddb97d00fba576064f7a60485313 100644
--- a/SOAP/Transport/HTTPng.pm
+++ b/SOAP/Transport/HTTPng.pm
@@ -449,11 +449,16 @@ sub send_response
 	if (!ref $res) {
 		$res ||= RC_OK;
 		$res = HTTP::Response->new($res, @_);
+	# Make sure anything we have, has no soapserver header
+	} else {
+		$res->remove_header('soapserver');
 	}
+
 	# Set SoapServer header
 	if ($self->{'daemon'}->{'_product_tokens'}) {
-		$res->headers->header('SoapServer',$self->{'daemon'}->{'_product_tokens'});
+		$res->headers->header('Server',$self->{'daemon'}->{'_product_tokens'});
 	}
+
 	my $content = $res->content;
 	my $chunked;
 	unless ($self->antique_client) {