diff --git a/templates/RSSFeed.ss b/templates/RSSFeed.ss
index c95af9330..dab956a9e 100755
--- a/templates/RSSFeed.ss
+++ b/templates/RSSFeed.ss
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
-<rss version="2.0">
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<title>$Title</title>
 		<link>$Link</link>
-		<% if Description %><description>$Description.XML</description><% end_if %>
+		<atom:link href="$Link" rel="self" type="application/rss+xml" />
+		<description>$Description.XML</description>
 
 		<% control Entries %>
 		<item>
@@ -12,10 +13,10 @@
 			<% if Description %><description>$Description.AbsoluteLinks.EscapeXML</description><% end_if %>
 			<% if Date %><pubDate>$Date.Rfc822</pubDate>
 			<% else %><pubDate>$Created.Rfc822</pubDate><% end_if %>
-			<% if Author %><author>$Author.XML</author><% end_if %>
+			<% if Author %><dc:creator>$Author.XML</dc:creator><% end_if %>
 			<guid>$AbsoluteLink</guid>
 		</item>
 		<% end_control %>
 
 	</channel>
-</rss>
+</rss>
\ No newline at end of file