diff --git a/layouts/feed/rss.xml b/layouts/feed/rss.xml
index 8224699..a56cd0a 100644
--- a/layouts/feed/rss.xml
+++ b/layouts/feed/rss.xml
@@ -12,7 +12,13 @@
       <item>
         <title>{{ .title }}</title>
         <description>{{ .comment }}</description>
-        <link>{{ (path.Join $baseDir .filename) | absURL }}</link>
+        <link>
+          {{ if isset . "url" }}
+            {{- .url | safeURL -}}
+          {{ else }}
+            {{- (path.Join $baseDir .filename) | absURL -}}
+          {{ end }}
+        </link>
         <author>{{ with $.Site.Author.email }}{{.}}{{end}}</author>
         <guid></guid>
         <pubDate>{{ (time .published).Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
diff --git a/layouts/shortcodes/download-feed.html b/layouts/shortcodes/download-feed.html
index ab74640..08c5f16 100644
--- a/layouts/shortcodes/download-feed.html
+++ b/layouts/shortcodes/download-feed.html
@@ -1,8 +1,7 @@
 {{ $dataName := .Get "data" }}
-{{ $baseDir := path.Dir .Page.File }}
 
 <ul>
   {{ range (index .Site.Data (split $dataName "/")) }}
-    <li><a href="{{ (path.Join $baseDir .filename) | absURL }}">{{ .title }}{{ with .filesize }} ({{ int (div (div . 1024) 1024) }} MB){{ end }}</a><br/>{{ .comment }}</li>
+    <li><a href="{{ .url | safeURL }}">{{ .title }}{{ with .filesize }} ({{ int (div (div . 1024) 1024) }} MB){{ end }}</a><br/>{{ .comment }}</li>
   {{ end }}
 </ul>