diff --git a/include/api.php b/include/api.php
index fbcfffef8..43a77bcc7 100644
--- a/include/api.php
+++ b/include/api.php
@@ -485,6 +485,8 @@
 		foreach($r as $item) {
 			$status = array(
 				'created_at'=> api_date($item['created']),
+				'published' => datetime_convert('UTC','UTC',$item['created'],ATOM_TIME),
+				'updated'   => datetime_convert('UTC','UTC',$item['edited'],ATOM_TIME),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
 				'html'		=> bbcode($item['body']),
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index 069ff7651..bc677d237 100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -15,8 +15,8 @@
 	 <content type="html">$status.html</content>
 	 <link rel="alternate" type="text/html" href="$status.url"/>
 	 <activity:verb>$status.verb</activity:verb>
-	 <published>$status.created_at</published>
-	 <updated>$status.created_at</updated>
+	 <published>$status.published</published>
+	 <updated>$status.updated</updated>
 
 	 <link rel="ostatus:conversation" href="$status.url"/>
 	 <!--