diff --git a/pelican/settings.py b/pelican/settings.py
index c0e30815..7a30e56e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -130,7 +130,7 @@ def configure_settings(settings, default_settings=None, filename=None):
     if ('SITEURL' in settings):
         # If SITEURL has a trailing slash, remove it and provide a warning
         siteurl = settings['SITEURL']
-        if (siteurl[len(siteurl) - 1:] == '/'):
+        if (siteurl.endswith('/')):
             settings['SITEURL'] = siteurl[:-1]
             logger.warn("Removed extraneous trailing slash from SITEURL.")
         # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL
diff --git a/pelican/writers.py b/pelican/writers.py
index faca46bd..4dd04a2a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -36,7 +36,7 @@ class Writer(object):
 
         feed.add_item(
             title=item.title,
-            link='%s%s' % (self.site_url, item.url),
+            link='%s/%s' % (self.site_url, item.url),
             unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
                                         item.date.date(), item.url),
             description=item.content,