diff --git a/lib/feed.xml b/lib/feed.xml
index f298a88a..864940e8 100644
--- a/lib/feed.xml
+++ b/lib/feed.xml
@@ -27,13 +27,13 @@
 
   {% for post in site.posts %}
     <entry>
-      <title>{{ post.title | xml_escape }}</title>
+      <title>{{ post.title | markdownify | strip_html | strip_newlines | xml_escape }}</title>
       <link href="{{ post.url | prepend: url_base }}" rel="alternate" type="text/html" title="{{ post.title | xml_escape }}" />
       <published>{{ post.date | date_to_xmlschema }}</published>
       <updated>{{ post.date | date_to_xmlschema }}</updated>
 
       <id>{{ post.id | prepend: url_base }}</id>
-      <content type="html">{{ post.content | xml_escape }}</content>
+      <content type="html">{{ post.content | markdownify | xml_escape }}</content>
 
       {% if post.author %}
         <author>
@@ -50,7 +50,7 @@
       {% endfor %}
 
       {% if post.excerpt %}
-        <summary>{{ post.excerpt | strip_html | strip_newlines | xml_escape }}</summary>
+        <summary>{{ post.excerpt | markdownify | strip_html | strip_newlines | xml_escape }}</summary>
       {% endif %}
     </entry>
   {% endfor %}
diff --git a/script/cibuild b/script/cibuild
index eb5f86b3..ca12e9ea 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,4 +1,6 @@
 #! /bin/bash
 
+set -e
+
 bundle exec rspec
 gem build jekyll-feed.gemspec
diff --git a/spec/fixtures/_posts/2013-12-12-dec-the-second.md b/spec/fixtures/_posts/2013-12-12-dec-the-second.md
index 02829945..89047e25 100644
--- a/spec/fixtures/_posts/2013-12-12-dec-the-second.md
+++ b/spec/fixtures/_posts/2013-12-12-dec-the-second.md
@@ -1,4 +1,4 @@
 ---
 ---
 
-December the twelfth, actually.
+# December the twelfth, actually.
diff --git a/spec/jekyll-feed_spec.rb b/spec/jekyll-feed_spec.rb
index 065578e9..c00c43b5 100644
--- a/spec/jekyll-feed_spec.rb
+++ b/spec/jekyll-feed_spec.rb
@@ -53,6 +53,10 @@
     expect(contents).to match /Line 1\nLine 2\nLine 3/
   end
 
+  it "converts markdown posts to HTML" do
+    expect(contents).to match /&lt;p&gt;March the second!&lt;\/p&gt;/
+  end
+
   context "parsing" do
     let(:feed) { RSS::Parser.parse(contents) }