diff --git a/_includes/blog_post.html b/_includes/blog_post.html
index f960292a..a6978d12 100644
--- a/_includes/blog_post.html
+++ b/_includes/blog_post.html
@@ -1,5 +1,4 @@
 {% assign page = include.page %}
-{% assign author = site.data.authors[page.author] %}
 
 <h1>
 {% if include.isPermalink %}
@@ -12,10 +11,10 @@
 <p class="meta">
   {{ page.date | date: "%B %e, %Y" }}
   by
-  {% if author.url %}
-    <a href="{{author.url}}">{{ author.name }}</a>
+  {% if page.author.url %}
+    <a href="{{page.author.url}}">{{ page.author.name }}</a>
   {% else %}
-    {{ author.name }}
+    {{ page.author.name }}
   {% endif %}
 </p>
 
diff --git a/_plugins/authors.rb b/_plugins/authors.rb
new file mode 100644
index 00000000..9630e1f0
--- /dev/null
+++ b/_plugins/authors.rb
@@ -0,0 +1,14 @@
+# This transforms the data associated with each post, specifically the author.
+# We store our author information in a yaml file and specify the keys in The
+# post front matter. Instead of looking up the complete data each time we need
+# it, we'll just look it up here and assign. This plays nicely with tools like
+# jekyll-feed which expect post.author to be in a specific format.
+module Authors
+  class Generator < Jekyll::Generator
+    def generate(site)
+      site.posts.each do |post|
+        post.data['author'] = site.data['authors'][post['author']]
+      end
+    end
+  end
+end
diff --git a/blog/all.html b/blog/all.html
index f8efa0a9..ecb7cd71 100644
--- a/blog/all.html
+++ b/blog/all.html
@@ -9,8 +9,7 @@ id: all-posts
   <div class="inner-content">
     <h1>All Posts</h1>
     {% for page in site.posts %}
-      {% assign author = site.data.authors[page.author] %}
-      <p><strong><a href="/react{{ page.url }}">{{ page.title }}</a></strong> on {{ page.date | date: "%B %e, %Y" }} by {{ author.name }}</p>
+      <p><strong><a href="/react{{ page.url }}">{{ page.title }}</a></strong> on {{ page.date | date: "%B %e, %Y" }} by {{ page.author.name }}</p>
     {% endfor %}
   </div>
 </section>