diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index db828cfa..271031b0 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -63,13 +63,7 @@
     <id>{{ $id }}</id>
 
     {{ range $page.OutputFormats }}
-        {{ $rel := .Rel }}
-
-        {{ if eq .Permalink $page.Permalink }}
-            {{ $rel = "self" }}
-        {{ else if eq $rel "canonical" }}
-            {{ $rel = "alternate" }}
-        {{ end }}
+        {{ $rel := cond (eq .Rel "canonical") "self" .Rel }}
 
         {{ printf `<link href="%s" rel="%s" type="%s"/>` .Permalink $rel .MediaType | safeHTML }}
     {{ end }}
@@ -146,7 +140,7 @@
                 <id>{{ $id }}</id>
 
                 {{ range .OutputFormats }}
-                    {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
+                    {{ $rel := cond (eq .Rel "canonical") "self" .Rel }}
 
                     {{ $href := cond (and (eq $rel "alternate") (eq .MediaType.Type "text/html")) $link .Permalink }}
 
diff --git a/layouts/_default/list.rss.xml b/layouts/_default/list.rss.xml
index 530f3a47..1c71f016 100644
--- a/layouts/_default/list.rss.xml
+++ b/layouts/_default/list.rss.xml
@@ -41,13 +41,7 @@
 <rss version="2.0" {{ with $language }} xml:lang="{{ . }}" {{ end }} xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
         {{ range $page.OutputFormats }}
-            {{ $rel := .Rel }}
-
-            {{ if eq .Permalink $page.Permalink }}
-                {{ $rel = "self" }}
-            {{ else if eq $rel "canonical" }}
-                {{ $rel = "alternate" }}
-            {{ end }}
+            {{ $rel := cond (eq .Rel "canonical") "self" .Rel }}
 
             {{ printf `<link href="%s" rel="%s" type="%s"/>` .Permalink $rel .MediaType | safeHTML }}
         {{ end }}