diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cc2bb4b..9eee64ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## 0.0.3 (unreleased)
+## 0.0.4 (unreleased)
+- Fix RSS feed link and description
+
+## 0.0.3 (2017-04-05)
 - Add some colours in console
 - Allow using a file other than config.toml for config
 - Add sections to the index page context
diff --git a/src/site.rs b/src/site.rs
index a3d7a5f3..8aea1c90 100644
--- a/src/site.rs
+++ b/src/site.rs
@@ -488,9 +488,9 @@ impl Site {
         context.add("config", &self.config);
 
         let rss_feed_url = if self.config.base_url.ends_with('/') {
-            format!("{}{}", self.config.base_url, "feed.xml")
+            format!("{}{}", self.config.base_url, "rss.xml")
         } else {
-            format!("{}/{}", self.config.base_url, "feed.xml")
+            format!("{}/{}", self.config.base_url, "rss.xml")
         };
         context.add("feed_url", &rss_feed_url);
 
diff --git a/src/templates/rss.xml b/src/templates/rss.xml
index 53aae2f5..bc787d8a 100644
--- a/src/templates/rss.xml
+++ b/src/templates/rss.xml
@@ -13,7 +13,7 @@
                 <pubDate>{{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</pubDate>
                 <link>{{ page.permalink }}</link>
                 <guid>{{ page.permalink }}</guid>
-                <description>"{{ page.content | escape }}"</description>
+                <description>{{ page.content }}</description>
             </item>
         {% endfor %}
     </channel>