diff --git a/wp-commentsrss2.php b/wp-commentsrss2.php
index 24da460849..6e4ca0ee82 100644
--- a/wp-commentsrss2.php
+++ b/wp-commentsrss2.php
@@ -3,7 +3,7 @@ if (! $feed) {
     require('wp-blog-header.php');
 }
 
-header('Content-type: application/rss+xml', true);
+header('Content-type: text/xml', true);
 
 echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; 
 ?>
diff --git a/wp-rss.php b/wp-rss.php
index ddbca07b7c..7db6415005 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -13,9 +13,9 @@ header('Content-type: text/xml', true);
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 <rss version="0.92">
     <channel>
-        <title><?php bloginfo_rss("name") ?></title>
-        <link><?php bloginfo_rss("url") ?></link>
-        <description><?php bloginfo_rss("description") ?></description>
+        <title><?php bloginfo_rss('name') ?></title>
+        <link><?php bloginfo_rss('url') ?></link>
+        <description><?php bloginfo_rss('description') ?></description>
         <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT')); ?></lastBuildDate>
         <docs>http://backend.userland.com/rss092</docs>
 
@@ -29,7 +29,7 @@ header('Content-type: text/xml', true);
 $more = 1; 
 if (get_settings('rss_use_excerpt')) {
 ?>
-            <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?></description>
+            <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
 <?php
 } else { // use content
 ?>
diff --git a/wp-rss2.php b/wp-rss2.php
index 0e01d16b5d..1c599dfac4 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -35,7 +35,7 @@ header('Content-type: text/xml', true);
 <?php if (get_settings('rss_use_excerpt')) : ?>
 		<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
 <?php else : ?>
-		<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
+		<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
 		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
 <?php endif; ?>