diff --git a/index.php b/index.php
index 98fe321795..cfba1a2595 100644
--- a/index.php
+++ b/index.php
@@ -19,8 +19,8 @@ require('wp-blog-header.php');
 	</style>
 	
 	<link rel="stylesheet" type="text/css" media="print" href="<?php echo $siteurl; ?>/print.css" />
-	<link rel="alternate" type="text/xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" />
-	<link rel="alternate" type="text/xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
+	<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
+	<link rel="alternate" type="application/rdf+xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" />
 	<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
 	<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
 	
diff --git a/wp-atom.php b/wp-atom.php
index 60128da522..795acc94c4 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -36,7 +36,7 @@ if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_leng
 		<?php the_category_rss('rdf') ?>
 <?php $more = 1; if ($rss_use_excerpt) {
 ?>
-		<summary type="text/html"><?php the_excerpt_rss($rss_excerpt_length, 2) ?></summary>
+		<summary type="text/html" mode="escaped"><?php the_excerpt_rss($rss_excerpt_length, 2) ?></summary>
 <?php
 } else { // use content
 ?>
diff --git a/wp-rdf.php b/wp-rdf.php
index d89fde7885..8b7d6eb3fd 100644
--- a/wp-rdf.php
+++ b/wp-rdf.php
@@ -5,7 +5,7 @@ if (! $feed) {
     require('wp-blog-header.php');
 }
 
-header('Content-type: text/xml', true);
+header('Content-type: application/rdf+xml', true);
 
 /* This doesn't take into account edits
 // Get the time of the most recent article
diff --git a/wp-rss2.php b/wp-rss2.php
index 86f14d3343..ef2ac63590 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -5,7 +5,7 @@ if (! $feed) {
     require('wp-blog-header.php');
 }
 
-header('Content-type: text/xml', true);
+header('Content-type: application/rss+xml', true);
 
 /* This doesn't take into account edits
 // Get the time of the most recent article