diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index ba69b834..ca85d1f0 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -64,6 +64,10 @@
         <id>{{ . }}</id>
     {{ end }}
 
+    {{ with $page.OutputFormats.Get "atom" }}
+        <link href="{{ .Permalink }}" hreflang="{{ $page.Language.LanguageCode }}" rel="self" type="application/atom+xml"/>
+    {{ end }}
+
     {{ range $page.OutputFormats }}
         {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
 
@@ -152,6 +156,8 @@
                     <id>{{ . }}</id>
                 {{ end }}
 
+                <link href="{{ $subpage.Permalink }}" hreflang="{{ $subpage.Language.LanguageCode }}" rel="self" type="text/html"/>
+
                 {{ range $subpage.OutputFormats }}
                     {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
 
diff --git a/layouts/_default/list.rss.xml b/layouts/_default/list.rss.xml
index 47dde8dc..ae9fbf40 100644
--- a/layouts/_default/list.rss.xml
+++ b/layouts/_default/list.rss.xml
@@ -40,6 +40,10 @@
 
 <rss version="2.0" {{ with $language }} xml:lang="{{ . }}" {{ end }} xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
+        {{ with $page.OutputFormats.Get "rss" }}
+            <atom:link href="{{ .Permalink }}" hreflang="{{ $page.Language.LanguageCode }}" rel="self" type="application/rss+xml"/>
+        {{ end }}
+
         {{ range $page.OutputFormats }}
             {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
 
@@ -139,6 +143,8 @@
                         <link>{{ . }}</link>
                     {{ end }}
 
+                    <atom:link href="{{ $subpage.Permalink }}" hreflang="{{ $subpage.Language.LanguageCode }}" rel="self" type="text/html"/>
+
                     {{ range $subpage.OutputFormats }}
                         {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}