diff --git a/handlers/handlerfeedgenerator.cpp b/handlers/handlerfeedgenerator.cpp
index ec0c2d3..e8a76f1 100644
--- a/handlers/handlerfeedgenerator.cpp
+++ b/handlers/handlerfeedgenerator.cpp
@@ -56,9 +56,10 @@ std::string HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGene
 	auto revisionDao = this->database->createRevisionDao();
 	auto pageDao = this->database->createPageDao();
 
+	std::string subtitle = filter;
 	if(utils::trim(filter).empty())
 	{
-		filter = "All pages";
+		subtitle = "All pages";
 	}
 
 	for(const EntryRevisionPair &entry : entries)
@@ -72,6 +73,7 @@ std::string HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGene
 			newestPublished = initialRevision.timestamp;
 		}
 		std::string entryPublished = utils::formatLocalDate(initialRevision.timestamp, dateformat) + "Z";
+		std::string entryUpdated = utils::formatLocalDate(current.timestamp, dateformat) + "Z";
 		std::string entryurl =
 			this->urlProvider->combine({this->urlProvider->rootUrl(), this->urlProvider->page(page.name)});
 		TemplatePage atomentry = this->templ->getPage("feeds/atomentry");
@@ -79,16 +81,18 @@ std::string HandlerFeedGenerator::generateAtom(const std::vector<HandlerFeedGene
 		atomentry.setVar("entryurl", utils::html_xss(entryurl));
 		atomentry.setVar("entryid", utils::html_xss(entryurl));
 		atomentry.setVar("entrypublished", entryPublished);
+		atomentry.setVar("entryupdated", entryUpdated);
 		Parser parser;
 		atomentry.setVar("entrycontent", utils::html_xss(parser.parse(*pageDao, *this->urlProvider, current.content)));
 		stream << atomentry.render();
 	}
 	stream << atomfooter;
 	TemplatePage atomheader = this->templ->getPage("feeds/atomheader");
-	atomheader.setVar("subtitle", filter);
-	atomheader.setVar("atomfeeduniqueid", utils::html_xss(this->urlProvider->atomFeed(filter)));
+	atomheader.setVar("subtitle", subtitle);
+	std::string selflink = utils::html_xss(this->urlProvider->atomFeed(filter));
+	atomheader.setVar("atomfeeduniqueid", selflink);
+	atomheader.setVar("atomselflink", selflink);
 	atomheader.setVar("atomfeedupdate", utils::formatLocalDate(newestPublished, dateformat) + "Z");
-
 	return atomheader.render() + stream.str();
 }
 
diff --git a/template/quitesimple/feeds/atomentry b/template/quitesimple/feeds/atomentry
index abb94e0..dc4de3a 100644
--- a/template/quitesimple/feeds/atomentry
+++ b/template/quitesimple/feeds/atomentry
@@ -3,5 +3,6 @@
     <link href="{qswiki:var:entryurl}"/>
     <id>{qswiki:var:entryid}</id>
     <published>{qswiki:var:entrypublished}</published>
+    <updated>{qswiki:var:entryupdated}</updated>
     <content type="html">{qswiki:var:entrycontent}</content>
 </entry>
diff --git a/template/quitesimple/feeds/atomheader b/template/quitesimple/feeds/atomheader
index 46a3408..b29f69a 100644
--- a/template/quitesimple/feeds/atomheader
+++ b/template/quitesimple/feeds/atomheader
@@ -5,4 +5,5 @@
   </author>
   <title>{qswiki:config:wikiname} - {qswiki:var:subtitle}</title>
   <id>{qswiki:var:atomfeeduniqueid}</id>
+  <link rel="self" href="{qswiki:var:atomselflink}"/>
   <updated>{qswiki:var:atomfeedupdate}</updated>