diff --git a/index.php b/index.php
index 080e9552e5..69446cc791 100644
--- a/index.php
+++ b/index.php
@@ -20,6 +20,7 @@ require_once('wp-blog-header.php');
 	<link rel="alternate" type="text/xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" />
 	<link rel="alternate" type="text/xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
 	<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
+	<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
 	
 	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
     <?php get_archives('monthly', '', 'link'); ?>
diff --git a/wp-atom.php b/wp-atom.php
new file mode 100644
index 0000000000..bbb12533ff
--- /dev/null
+++ b/wp-atom.php
@@ -0,0 +1,47 @@
+<?php 
+$blog = 1;
+$doing_rss = 1;
+header('Content-type: application/atom+xml', true);
+require('wp-blog-header.php');
+if (!isset($rss_language)) { $rss_language = 'en'; }
+if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }
+if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }
+?>
+<?php echo '<?xml version="1.0"?'.'>'; ?>
+<feed version="0.3"
+  xmlns="http://purl.org/atom/ns#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xml:lang="<?php echo $rss_language ?>">
+	<title><?php bloginfo_rss('name') ?></title>
+	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
+	<tagline><?php bloginfo_rss("description") ?></tagline>
+	<modified><?php echo gmdate('Y-m-d\TG:i:s\Z'); ?></modified>
+	<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></copyright>
+	<generator url="http://wordpress.org/" version="<?php echo $wp_version ?>">WordPress</generator>
+	<id>tag:<?php echo str_replace('http://', '', $siteurl); ?>,<?php echo date('Y'); ?>:1984</id>
+	
+	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
+	<entry>
+	  	<author>
+			<name><?php the_author() ?></name>
+		</author>
+		<title><?php the_title_rss() ?></title>
+		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
+		<id><?php bloginfo_rss("url") ?>?p=<?php echo $id; ?></id>
+		<modified><?php the_time('Y-m-d\TH:i:s\Z'); ?></modified>
+		<issued><?php the_time('Y-m-d\TH:i:s\Z'); ?></issued>
+		<?php the_category_rss('rdf') ?>
+<?php $more = 1; if ($rss_use_excerpt) {
+?>
+		<summary type="text/html"><?php the_excerpt_rss($rss_excerpt_length, 2) ?></summary>
+<?php
+} else { // use content
+?>
+		<description><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></description>
+<?php
+} // end else use content
+?>
+		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
+	</entry>
+	<?php $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>
+</feed>
\ No newline at end of file
diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index 1bec9fe4e7..5dfe42b31c 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -55,6 +55,9 @@ function get_bloginfo($show='') {
 		case "rss2_url":
 			$output = $siteurl.'/wp-rss2.php';
 			break;
+		case "atom_url":
+			$output = $siteurl.'/wp-atom.php';
+			break;		
 		case "comments_rss2_url":
 			$output = $siteurl.'/wp-commentsrss2.php';
 			break;