--- lib/CGI.pm.orig	2004-03-10 00:17:54.000000000 +0900
+++ lib/CGI.pm	2004-03-11 17:47:28.000000000 +0900
@@ -1375,7 +1375,7 @@
     }
 
     $type ||= 'text/html' unless defined($type);
-    $type .= "; charset=$charset" if $type ne '' and $type =~ m!^text/! and $type !~ /\bcharset\b/ and $charset ne '';
+    $type .= "; charset=$charset" if $type ne '' and ($type =~ m!^text/! or $type =~ m!^application/xml(-.*)?$! or $type =~ m!^application/.*\+xml$! or $type =~ m!image/svg\+xml!) and $type !~ /\bcharset\b/ and $charset ne '';
 
     # Maybe future compatibility.  Maybe not.
     my $protocol = $ENV{SERVER_PROTOCOL} || 'HTTP/1.0';