diff --git a/wp-atom.php b/wp-atom.php
index 4ab65e072..11db36506 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -34,7 +34,7 @@ $more = 1;
 			<name><?php the_author() ?></name>
 			<uri><?php the_author_url()?></uri>
 		</author>
-		<title type="text/html" mode="escaped"><![CDATA[<?php the_title_rss() ?>]]></title>
+		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
 		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
 		<id><?php the_guid(); ?></id>
 		<updated><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></updated>
@@ -48,4 +48,4 @@ $more = 1;
 <?php do_action('atom_entry'); ?>
 	</entry>
 	<?php endwhile ; ?>
-</feed>
\ No newline at end of file
+</feed>
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 358eb981b..6c57fc5e7 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -166,7 +166,7 @@ function the_category_rss($type = 'rss') {
 }
 
 function html_type_rss() {
-	$type = bloginfo('html_type');
+	$type = get_bloginfo('html_type');
 	if ( strstr( $type, 'xhtml' ) )
 		$type = 'xhtml';
 	else
@@ -195,4 +195,4 @@ function rss_enclosure() {
 	}
 }
 
-?>
\ No newline at end of file
+?>