diff --git a/wp-atom.php b/wp-atom.php
index 4a23c35c98..8839824fc4 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -42,6 +42,7 @@ $more = 1;
 <?php else : ?>
 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
 <?php endif; ?>
+<?php rss_enclosure(); ?>
 	</entry>
 	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
 </feed>
diff --git a/wp-rss2.php b/wp-rss2.php
index 5d28543dbd..c661399037 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -38,11 +38,15 @@ $more = 1;
 		<description><?php the_excerpt_rss() ?></description>
 <?php else : ?>
 		<description><?php the_excerpt_rss() ?></description>
+	<?php if ( strlen( $post->post_content ) > 0 ) : ?>
 		<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 rss_enclosure(); ?>
 	</item>
 	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
 </channel>
-</rss>
\ No newline at end of file
+</rss>