Index: wp-atom.php
===================================================================
--- wp-atom.php	(revision 3759)
+++ wp-atom.php	(working copy)
@@ -2,44 +2,45 @@
 
 if (empty($wp)) {
 	require_once('wp-config.php');
-	wp('feed=atom');
+	wp('feed=atom1');
 }
 
 header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
-<feed version="0.3"
-  xmlns="http://purl.org/atom/ns#"
+<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.">\n"; ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xml:lang="<?php echo get_option('rss_language'); ?>"
   <?php do_action('atom_ns'); ?>
   >
-	<title><?php bloginfo_rss('name') ?></title>
-	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
-	<tagline><?php bloginfo_rss("description") ?></tagline>
-	<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></modified>
-	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog'), 0); ?></copyright>
-	<generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
+	<id><?php echo get_settings('home') . '/#Atom'; ?></id>
+	<link rel="self" href="<?php bloginfo('atom_url'); ?>" />
+	<title type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><?php bloginfo_rss('name') ?></div></title>
+	<subtitle type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><?php bloginfo_rss("description") ?></div></subtitle>
+	<updated><?php echo mysql2date('Y-m-d', get_lastpostmodified('GMT'), false) . 'T' .  mysql2date('H:i:s', get_lastpostmodified('GMT'), false) . 'Z'; ?></updated>
 	<?php do_action('atom_head'); ?>
 	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
-	<entry>
-	  	<author>
-			<name><?php the_author() ?></name>
-		</author>
-		<title type="text/html" mode="escaped"><![CDATA[<?php the_title_rss() ?>]]></title>
-		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
-		<id><?php the_guid(); ?></id>
-		<modified><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></modified>
-		<issued><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></issued>
-		<?php the_category_rss('rdf') ?> 
-		<summary type="text/plain" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_settings('rss_use_excerpt') ) : ?>
-		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-<?php endif; ?>
-<?php rss_enclosure(); ?>
-<?php do_action('atom_entry'); ?>
-	</entry>
+		<entry>
+	  		<author>
+				<name><?php the_author() ?></name>
+				<uri><?php echo get_settings('home'); ?></uri>
+			</author>
+			<title type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><?php the_title_rss() ?></div></title>
+			<link rel="alternate" href="<?php permalink_single_rss() ?>" />
+			<id><?php the_guid(); ?></id>
+			<updated><?php echo get_post_time('Y-m-d', true) . 'T' . get_post_time('H:i:s', true) . 'Z'; ?></updated>
+			<?php the_category_rss('rdf'); ?>
+			<summary type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><?php the_excerpt_rss(); ?></div></summary>
+			<?php if ( !get_settings('rss_use_excerpt') ) : ?>
+				<content type="xhtml" xml:base="<?php permalink_single_rss() ?>">
+					<div xmlns="http://www.w3.org/1999/xhtml">
+						<?php the_content('', 0, '') ?>
+					</div>
+				</content>
+			<?php endif; ?>
+			<?php do_action('atom_entry'); ?>
+		</entry>
 	<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
 </feed>