diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index 3d68b0d55..45e198eee 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -213,9 +213,10 @@ function populate_options() {
 	add_option('blacklist_keys');
 	add_option('comment_registration', 0);
 	add_option('open_proxy_check', 1);
+	add_option('rss_language', 'en');
 
 	// Delete unused options
-	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'rss_language', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url');
+	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url');
 	foreach ($unusedoptions as $option) :
 		delete_option($option);
 	endforeach;
diff --git a/wp-atom.php b/wp-atom.php
index fa34f5526..691de2856 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -14,7 +14,9 @@ $more = 1;
 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
 <feed version="0.3"
   xmlns="http://purl.org/atom/ns#"
-  xmlns:dc="http://purl.org/dc/elements/1.1/">
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xml:lang="<?php echo get_option('rss_language'); ?>"
+  >
 	<title><?php bloginfo_rss('name') ?></title>
 	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
 	<tagline><?php bloginfo_rss("description") ?></tagline>
diff --git a/wp-rss.php b/wp-rss.php
index 223f419d8..7c2ac2123 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -14,29 +14,24 @@ $more = 1;
 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
 <!-- 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>
+<channel>
+	<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'), 0); ?></lastBuildDate>
-        <docs>http://backend.userland.com/rss092</docs>
+	<docs>http://backend.userland.com/rss092</docs>
+	<language><?php echo get_option('rss_language'); ?></language>
 
 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
-        <item>
-            <title><?php the_title_rss() ?></title>
-<?php
-if (get_settings('rss_use_excerpt')) {
-?>
-            <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php
-} else { // use content
-?>
-            <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
-<?php
-} // end else use content
-?>
-            <link><?php permalink_single_rss() ?></link>
-        </item>
+	<item>
+		<title><?php the_title_rss() ?></title>
+<?php if (get_settings('rss_use_excerpt')) { ?>
+		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
+<?php } else { // use content ?>
+		<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
+<?php } ?>
+		<link><?php permalink_single_rss() ?></link>
+	</item>
 <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
-    </channel>
+</channel>
 </rss>
diff --git a/wp-rss2.php b/wp-rss2.php
index ae83b9e7b..d4ef5239d 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -26,6 +26,7 @@ $more = 1;
 	<description><?php bloginfo_rss("description") ?></description>
 	<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
 	<generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
+	<language><?php echo get_option('rss_language'); ?></language>
 
 	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
 	<item>