diff --git a/wp-atom.php b/wp-atom.php
index b8cfc6afe8..6d2ea65d6f 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -33,9 +33,15 @@ $more = 1;
 		<issued><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt); ?></issued>
 		<?php the_category_rss('rdf') ?>
 		<summary type="text/html" mode="escaped"><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></summary>
-<?php if (!get_settings('rss_use_excerpt')) { ?>
+<?php if (!get_settings('rss_use_excerpt')) : ?>
+	<?php if ( strlen( $post->post_content ) ) : ?>
 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-<?php } ?>
+	<?php else : ?>
+		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></content>
+	<?php endif; ?>
+<?php else : ?>
+		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss('', 2) ?>]]></content>
+<?php endif; ?>
 	</entry>
 	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
-</feed>
\ No newline at end of file
+</feed>
diff --git a/wp-includes/template-functions-post.php b/wp-includes/template-functions-post.php
index f5314f6626..7df01fbad6 100644
--- a/wp-includes/template-functions-post.php
+++ b/wp-includes/template-functions-post.php
@@ -142,7 +142,7 @@ function the_excerpt() {
     echo apply_filters('the_excerpt', get_the_excerpt());
 }
 
-function the_excerpt_rss($cut = 0, $encode_html = 0) {
+function the_excerpt_rss($cut = 0, $encode_html = FALSE) {
     $output = get_the_excerpt(true);
 
     $output = convert_chars($output);
@@ -152,7 +152,7 @@ function the_excerpt_rss($cut = 0, $encode_html = 0) {
     if ($encode_html == 1) {
         $output = wp_specialchars($output);
         $cut = 0;
-    } elseif ($encode_html == 0) {
+    } elseif ($encode_html === 0) {
         $output = make_url_footnote($output);
     } elseif ($encode_html == 2) {
         $output = strip_tags($output);
@@ -448,4 +448,4 @@ function _page_level_out($parent, $page_tree, $args, $depth = 0) {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-rss2.php b/wp-rss2.php
index 22d6a40168..581e10193b 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -38,7 +38,11 @@ $more = 1;
 		<description><?php the_excerpt_rss('', 2) ?></description>
 <?php else : ?>
 		<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
+	<?php if ( strlen( $post->post_content ) ) : ?>
 		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+	<?php else : ?>
+		<content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
+	<?php endif; ?>
 <?php endif; ?>
 		<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
 <?php