diff --git a/pelican/writers.py b/pelican/writers.py
index da105929..70389ae3 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -33,7 +33,7 @@ class Writer(object):
         sitename = Markup(context['SITENAME']).striptags()
         feed = feed_class(
             title=sitename,
-            link=(self.site_url + '/'),
+            link=(self.feed_domain + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''))
         return feed
@@ -43,8 +43,8 @@ class Writer(object):
         title = Markup(item.title).striptags()
         feed.add_item(
             title=title,
-            link='%s/%s' % (self.site_url, item.url),
-            unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
+            link='%s/%s' % (self.feed_domain, item.url),
+            unique_id='tag:%s,%s:%s' % (self.feed_domain.replace('http://', ''),
                                         item.date.date(), item.url),
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,