diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php
index bacce2887b..ba58a4c904 100644
--- a/wp-includes/template-functions-links.php
+++ b/wp-includes/template-functions-links.php
@@ -187,14 +187,14 @@ function get_feed_link($feed='rss2') {
         case 'comments_rss2':
             $output = $feed_url .'/wp-commentsrss2.php';
             if ($do_perma) {
-                $output = $comment_feed_url . '/rss2/';
+                $output = $comment_feed_url . '/';
             }
             break;
         case 'rss2':
         default:
             $output = $feed_url .'/wp-rss2.php';
             if ($do_perma) {
-                $output = $feed_url . '/rss2/';
+                $output = $feed_url . '/';
             }
             break;
     }
diff --git a/wp-rss2.php b/wp-rss2.php
index c661399037..26f2f27ab5 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -35,9 +35,9 @@ $more = 1;
 
 		<guid><?php the_permalink($id); ?></guid>
 <?php if (get_settings('rss_use_excerpt')) : ?>
-		<description><?php the_excerpt_rss() ?></description>
+		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php else : ?>
-		<description><?php the_excerpt_rss() ?></description>
+		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<?php if ( strlen( $post->post_content ) > 0 ) : ?>
 		<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
 	<?php else : ?>