diff --git a/webtools/bugzilla/Bug.pm b/webtools/bugzilla/Bug.pm
index 5ae83d29525a..7ac2bd1012c7 100755
--- a/webtools/bugzilla/Bug.pm
+++ b/webtools/bugzilla/Bug.pm
@@ -325,7 +325,7 @@ sub XML_Header {
   my ($urlbase, $version, $maintainer, $exporter) = (@_);
 
   my $xml;
-  $xml = "<?xml version=\"1.0\" standalone=\"no\"?>\n";
+  $xml = "<?xml version=\"1.0\" standalone=\"yes\"?>\n";
   $xml .= "<!DOCTYPE bugzilla SYSTEM \"$urlbase";
   if (! ($urlbase =~ /.+\/$/)) {
     $xml .= "/";
diff --git a/webtools/bugzilla/Bugzilla/Bug.pm b/webtools/bugzilla/Bugzilla/Bug.pm
index 5ae83d29525a..7ac2bd1012c7 100644
--- a/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/webtools/bugzilla/Bugzilla/Bug.pm
@@ -325,7 +325,7 @@ sub XML_Header {
   my ($urlbase, $version, $maintainer, $exporter) = (@_);
 
   my $xml;
-  $xml = "<?xml version=\"1.0\" standalone=\"no\"?>\n";
+  $xml = "<?xml version=\"1.0\" standalone=\"yes\"?>\n";
   $xml .= "<!DOCTYPE bugzilla SYSTEM \"$urlbase";
   if (! ($urlbase =~ /.+\/$/)) {
     $xml .= "/";
diff --git a/webtools/bugzilla/xml.cgi b/webtools/bugzilla/xml.cgi
index 8356c3d8971a..f35a13cd9f70 100755
--- a/webtools/bugzilla/xml.cgi
+++ b/webtools/bugzilla/xml.cgi
@@ -45,7 +45,7 @@ my $exporter = $::COOKIE{"Bugzilla_login"} || undef;
 
 my @ids = split (/[, ]+/, $::FORM{'id'});
 
-print "Content-type: text/plain\n\n";
+print "Content-type: text/xml\n\n";
 print Bug::XML_Header(Param("urlbase"), $::param{'version'}, 
                       Param("maintainer"), $exporter);
 foreach my $id (@ids) {