diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1114c62..2d669a8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -43,8 +43,8 @@
     <link rel="shortcut icon"
         href="{{ if .Site.Params.faviconfile }}{{ .Site.Params.faviconfile | absURL }}{{ else }}{{ .Site.BaseURL }}img/favicon.ico{{ end }}">
 
-    {{ if .Site.RSSLink }}
-    <link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    {{ with .OutputFormats.Get "RSS" }}
+    <link href="{{ .Permalink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
     {{ end }}
 </head>
 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index f8e6bfa..1a81f93 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -55,13 +55,13 @@
                         {{ end }}
 
                         {{ if .Site.Params.gitlab }}
-                        <li><a href="https://gitlab.com/{{ .Site.Params.gitlab }}" target="_blank"
-                                rel="noopener"> @{{.Site.Params.gitlab }}</a></li>
+                        <li><a href="https://gitlab.com/{{ .Site.Params.gitlab }}" target="_blank" rel="noopener"></a>
+                            @{{.Site.Params.gitlab }}</a></li>
                         {{ end }}
 
                         {{ if .Site.Params.medium }}
-                        <li><a href="https://medium.com/@{{ .Site.Params.medium }}" target="_blank"
-                                rel="noopener"> @{{.Site.Params.medium }}</a></li>
+                        <li><a href="https://medium.com/@{{ .Site.Params.medium }}" target="_blank" rel="noopener">
+                                @{{.Site.Params.medium }}</a></li>
                         {{ end }}
 
                         {{ if .Site.Params.twitter }}
@@ -87,8 +87,8 @@
                                 Colophon</a></li>
                         {{ end }}
 
-                        {{ if .Site.RSSLink }}
-                        <li><a href="{{ .Site.RSSLink }}" class="mr-0">
+                        {{ with .OutputFormats.Get "RSS" }}
+                        <li><a href="{{ .Permalink }}" class="mr-0">
                                 <svg class="svg-icon mr-1">
                                     <use xlink:href="#rss-fill"></use>
                                 </svg>