diff --git a/run.php b/run.php
index ec39bb3..254ef30 100644
--- a/run.php
+++ b/run.php
@@ -1,16 +1,20 @@
 <?php if (!defined('ARCHIVE_MY_TWEETS')) exit('No direct access allowed.');
 
 if (file_exists(dirname(__FILE__).'/config.php')) {
-	
+
 	require_once('includes.php');
 	$config = (isset($config)) ? $config : array();
+	if(isset($_GET['atom']) && $_GET['atom'] == "1")
+	{
+		$config['theme'] = 'atom';
+	}
 	$amt = new \AMWhalen\ArchiveMyTweets\App($config);
 	$amt->run();
-	
+
 } else {
 
 	require_once('amt/installer.php');
 	$installer = new \AMWhalen\ArchiveMyTweets\Installer(dirname(__FILE__));
 	$installer->run();
 
-}
\ No newline at end of file
+}
diff --git a/themes/atom/_layout.php b/themes/atom/_layout.php
new file mode 100644
index 0000000..e898c3b
--- /dev/null
+++ b/themes/atom/_layout.php
@@ -0,0 +1,37 @@
+<?php echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; ?>
+<feed
+	xmlns="http://www.w3.org/2005/Atom"
+	xmlns:thr="http://purl.org/syndication/thread/1.0"
+	xml:lang="en-US"
+>
+	<id>tag:archivemytweets.com,2012:<?php echo $config['system']['baseUrl']; ?></id>
+	<link type="text/html" rel="alternate" href="<?php echo $config['system']['baseUrl']; ?>"/>
+	<link rel="self" type="application/atom+xml" href="<?php
+// From http://stackoverflow.com/a/2236887
+function strleft($s1, $s2) { return substr($s1, 0, strpos($s1, $s2)); }
+$s = empty($_SERVER["HTTPS"]) ? '' : ($_SERVER["HTTPS"] == "on") ? "s" : "";
+$protocol = strleft(strtolower($_SERVER["SERVER_PROTOCOL"]), "/").$s;
+$port = ($_SERVER["SERVER_PORT"] == "80") ? "" : (":".$_SERVER["SERVER_PORT"]);
+
+echo $protocol."://".$_SERVER['SERVER_NAME'].$port.str_replace('&', '&amp;', $_SERVER['REQUEST_URI']);
+
+?>" />
+
+	<title><?php echo $config['twitter']['username']; ?> - <?php echo $config['twitter']['name']; ?> - Tweets</title>
+<?php
+// Get the first date of the first tweet
+if($tweets !== false && $tweets[0])
+{
+	$t = new \AMWhalen\ArchiveMyTweets\Tweet();
+	$t->load($tweets[0]);
+	$last_updated = $t->get_date("c");
+}
+else
+{
+	// Do not know when the feed was last updated, so answer "now"
+	$last_updated = date("c");
+}
+?>
+	<updated><?php echo $last_updated ?></updated>
+	<?php echo $content; ?>
+</feed>
diff --git a/themes/atom/index.php b/themes/atom/index.php
new file mode 100644
index 0000000..713c82c
--- /dev/null
+++ b/themes/atom/index.php
@@ -0,0 +1,35 @@
+<!-- index -->
+
+	<?php
+
+	if ($tweets !== false) {
+		foreach ($tweets as $row):
+			$t = new \AMWhalen\ArchiveMyTweets\Tweet();
+			$t->load($row);
+
+			$classes = array('tweet');
+			if ($t->in_reply_to_status_id != 0) $classes[] = 'reply';
+			if ($t->truncated != 0) $classes[] = 'truncated';
+			$class = implode(' ', $classes);
+
+	?>
+
+	<entry>
+		<id>tag:archivemytweets.org,2012:<?php echo $config['system']['baseUrl'] ?>::Tweet/<?php echo $t->id; ?></id>
+		<link type="text/html" rel="alternate" href="<?php echo 'https://twitter.com/'.$config['twitter']['username'].'/status/'.$t->id; ?>"/>
+		<title><?php echo $t->tweet; ?></title>
+		<updated><?php echo $t->get_date("c"); ?></updated>
+		<author>
+			<name><?php echo $config['twitter']['username'] ?> - <?php echo $config['twitter']['name']; ?></name>
+		</author>
+		<content type="html">
+			<?php echo htmlspecialchars("<p>".$t->get_linked_tweet()."</p><hr/>");
+				echo htmlspecialchars($t->source);
+				echo ($t->in_reply_to_status_id != 0) ? htmlspecialchars(' <a href="http://twitter.com/'.$t->in_reply_to_screen_name.'/status/'.$t->in_reply_to_status_id.'">in reply to '.$t->in_reply_to_screen_name.'</a>') : '';
+			?>
+
+		</content>
+	</entry>
+	<?php endforeach; ?>
+	<?php } ?>
+<!-- /index -->
diff --git a/themes/default/_layout.php b/themes/default/_layout.php
index c21d0fb..3195ff6 100644
--- a/themes/default/_layout.php
+++ b/themes/default/_layout.php
@@ -6,6 +6,7 @@
 	<title>@<?php echo $config['twitter']['username']; ?> - <?php echo $config['twitter']['name']; ?> - Tweets</title>
 	<link href="<?php echo $config['system']['baseUrl']; ?>css/archive.css" rel="stylesheet">
 	<link href="<?php echo $config['system']['baseUrl']; ?>assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<?php echo $config['system']['baseUrl']; ?>/?atom=1" rel="alternate" title="Tweets for <?php echo $config['twitter']['name']; ?>" type="application/atom+xml" />
 	<!--[if lt IE 9]>
 		<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->