Index: wp-includes/feed-atom.php
===================================================================
--- wp-includes/feed-atom.php	(revision 17848)
+++ wp-includes/feed-atom.php	(working copy)
@@ -21,8 +21,8 @@
 
 	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
 
-	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
-	<id><?php bloginfo('atom_url'); ?></id>
+	<link rel="alternate" href="<?php bloginfo_rss('url') ?>" />
+	<id><?php bloginfo_rss('atom_url'); ?></id>
 	<link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
 	<?php do_action('atom_head'); ?>
@@ -35,19 +35,19 @@
 			<?php endif;
 			do_action('atom_author'); ?>
 		</author>
-		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
-		<link rel="alternate" type="text/html" href="<?php the_permalink_rss() ?>" />
+		<title><?php the_title_rss() ?></title>
+		<link rel="alternate" href="<?php the_permalink_rss() ?>" />
 		<id><?php the_guid() ; ?></id>
 		<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
 		<published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
 		<?php the_category_rss('atom') ?>
-		<summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
+		<summary type="<?php html_type_rss(); ?>"><?php the_excerpt_feed('atom'); ?></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
-		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>
+		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><?php the_content_feed('atom'); ?></content>
 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
-		<link rel="replies" type="text/html" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
+		<link rel="replies" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
 		<link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo get_comments_number()?>"/>
 		<thr:total><?php echo get_comments_number()?></thr:total>
 	</entry>
Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php	(revision 17848)
+++ wp-includes/feed.php	(working copy)
@@ -145,7 +145,14 @@
 		$feed_type = get_default_feed();
 
 	$content = apply_filters('the_content', get_the_content());
-	$content = str_replace(']]>', ']]&gt;', $content);
+	if ($feed_type == 'atom') {
+		if (strpos(get_bloginfo('html_type'), 'xhtml') !== false) {
+			$content = '<div xmlns="http://www.w3.org/1999/xhtml">' . $content . '</div>';
+		}
+		else {
+			$content = '<![CDATA[' . $content . ']]>';
+		}
+	}
 	return apply_filters('the_content_feed', $content, $feed_type);
 }
 
@@ -165,16 +172,30 @@
 }
 
 /**
- * Display the post excerpt for the feed.
+ * Display the post excerpt for the feeds.
  *
  * @package WordPress
  * @subpackage Feed
- * @since 0.71
+ * @since 3.2.0
  * @uses apply_filters() Calls 'the_excerpt_rss' hook on the excerpt.
+ * @uses apply_filters() Calls 'the_excerpt_feed' hook on the excerpt.
+ *
+ * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
  */
-function the_excerpt_rss() {
-	$output = get_the_excerpt();
-	echo apply_filters('the_excerpt_rss', $output);
+function the_excerpt_feed($feed_type = null) {
+	if ( !$feed_type )
+		$feed_type = get_default_feed();
+		
+	$output = apply_filters('the_excerpt_rss', get_the_excerpt());
+	if ($feed_type == 'atom') {
+		if (strpos(get_bloginfo('html_type'), 'xhtml') !== false) {
+			$output = '<div xmlns="http://www.w3.org/1999/xhtml">' . $output . '</div>';
+		}
+		else {
+			$output = '<![CDATA[' . $output . ']]>';
+		}
+	}
+	echo apply_filters('the_excerpt_feed', $output, $feed_type);
 }
 
 /**
Index: wp-includes/feed-rss2.php
===================================================================
--- wp-includes/feed-rss2.php	(revision 17848)
+++ wp-includes/feed-rss2.php	(working copy)
@@ -41,13 +41,13 @@
 
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 <?php if (get_option('rss_use_excerpt')) : ?>
-		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
+		<description><![CDATA[<?php the_excerpt_feed('rss2') ?>]]></description>
 <?php else : ?>
-		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
+		<description><![CDATA[<?php the_excerpt_feed('rss2') ?>]]></description>
 	<?php if ( strlen( $post->post_content ) > 0 ) : ?>
 		<content:encoded><![CDATA[<?php the_content_feed('rss2') ?>]]></content:encoded>
 	<?php else : ?>
-		<content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>
+		<content:encoded><![CDATA[<?php the_excerpt_feed('rss2') ?>]]></content:encoded>
 	<?php endif; ?>
 <?php endif; ?>
 		<wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
Index: wp-includes/feed-rdf.php
===================================================================
--- wp-includes/feed-rdf.php	(revision 17848)
+++ wp-includes/feed-rdf.php	(working copy)
@@ -43,9 +43,9 @@
 	<dc:creator><?php the_author() ?></dc:creator>
 	<?php the_category_rss('rdf') ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
-	<description><?php the_excerpt_rss() ?></description>
+	<description><?php the_excerpt_feed('rdf') ?></description>
 <?php else : ?>
-	<description><?php the_excerpt_rss() ?></description>
+	<description><?php the_excerpt_feed('rdf') ?></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
 <?php endif; ?>
 	<?php do_action('rdf_item'); ?>
Index: wp-includes/feed-rss.php
===================================================================
--- wp-includes/feed-rss.php	(revision 17848)
+++ wp-includes/feed-rss.php	(working copy)
@@ -22,7 +22,7 @@
 <?php while (have_posts()) : the_post(); ?>
 	<item>
 		<title><?php the_title_rss() ?></title>
-		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
+		<description><![CDATA[<?php the_excerpt_feed('rss') ?>]]></description>
 		<link><?php the_permalink_rss() ?></link>
 		<?php do_action('rss_item'); ?>
 	</item>
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php	(revision 17848)
+++ wp-includes/deprecated.php	(working copy)
@@ -2585,6 +2585,21 @@
 }
 
 /**
+ * Display the post excerpt for the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @deprecated 3.2.0
+ * @deprecated Use the_excerpt_feed()
+ * @see the_excerpt_feed()
+ */
+function the_excerpt_rss() {
+	_deprecated_function( __FUNCTION__, '3.2', 'the_excerpt_feed' );
+	the_excerpt_feed('rss');
+}
+
+/**
  * Update the categories cache.
  *
  * This function does not appear to be used anymore or does not appear to be