diff --git a/feed.xml b/feed.xml
index 4d4838e40..f72f584d1 100644
--- a/feed.xml
+++ b/feed.xml
@@ -4,23 +4,23 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
 	<channel>
 		<title>{{ site.title | xml_escape }}</title>
-		<description>{% if site.description %}{{ site.description | xml_escape }}{% endif %}</description>		
-		<link>{{ site.url }}</link>
-		<atom:link href="{{ site.url }}/feed.xml" rel="self" type="application/rss+xml" />
+		<description>{% if site.description %}{{ site.description | xml_escape }}{% endif %}</description>
+		<link>{{site.url}}{{site.baseurl}}</link>
+		<atom:link href="{{site.url}}{{site.baseurl}}/feed.xml" rel="self" type="application/rss+xml" />
 		{% for post in site.posts limit:10 %}
 			<item>
-				<title>{{ post.title | xml_escape }}</title>
+				<title>{{post.title | xml_escape}}</title>
 				{% if post.author.name %}
-					<dc:creator>{{ post.author.name | xml_escape }}</dc:creator>
-				{% endif %}        
+					<dc:creator>{{post.author.name | xml_escape}}</dc:creator>
+				{% endif %}
 				{% if post.excerpt %}
-					<description>{{ post.excerpt | xml_escape }}</description>
+					<description>{{post.excerpt | xml_escape}}</description>
 				{% else %}
-					<description>{{ post.content | xml_escape }}</description>
+					<description>{{post.content | xml_escape}}</description>
 				{% endif %}
 				<pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
-				<link>{{ site.url }}{{ post.url }}</link>
-				<guid isPermaLink="true">{{ site.url }}{{ post.url }}</guid>
+				<link>{{site.url}}{{site.baseurl}}{{post.url}}</link>
+				<guid isPermaLink="true">{{site.url}}{{site.baseurl}}{{post.url}}</guid>
 			</item>
 		{% endfor %}
 	</channel>