diff --git a/templates/feed/atom.php b/templates/feed/atom.php
index 3c92864..7ed1587 100644
--- a/templates/feed/atom.php
+++ b/templates/feed/atom.php
@@ -17,7 +17,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
         href="<?php echo htmlspecialchars($siteUrl . $basePath) ?>feed/atom" />
   <link rel="alternate" href="<?= $siteUrl ?>"/>
   <updated><?= $updated ?></updated>
-  <id><?= $siteUrl ?></id>
+  <id><?= $siteUrl . $basePath ?></id>
   <author>
         <name><?= $siteTitle ?></name>
   </author>
diff --git a/templates/feed/rss.php b/templates/feed/rss.php
index 5455d70..f4c3d56 100644
--- a/templates/feed/rss.php
+++ b/templates/feed/rss.php
@@ -7,10 +7,11 @@
 header('Content-Type: application/rss+xml; charset=utf-8');
 echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
 ?>
-<rss version="2.0">
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
     <title><?php echo htmlspecialchars($config->siteTitle, ENT_XML1, 'UTF-8') ?> RSS Feed</title>
     <link><?php echo htmlspecialchars($config->baseUrl . $config->basePath, ENT_XML1, 'UTF-8')?></link>
+    <atom:link href="<?php echo htmlspecialchars($config->baseUrl . $config->basePath, ENT_XML1, 'UTF-8')?>" rel="self" type="application/rss+xml" />
     <description><?php echo htmlspecialchars($config->siteDescription, ENT_XML1, 'UTF-8') ?></description>
     <language>en-us</language>
     <lastBuildDate><?php echo date(DATE_RSS); ?></lastBuildDate>