diff --git a/Gemfile b/Gemfile
index 7c374c7c..7ddda06e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,7 @@ end
 
 gem 'jekyll-paginate', '~> 1.0'
 gem 'jekyll-coffeescript', '~> 1.0'
+gem 'jekyll-feed'
 gem 'jekyll-gist', '~> 1.0'
 gem 'mime-types', '~> 2.6'
 gem 'kramdown', '~> 1.8.0'
diff --git a/site/_config.yml b/site/_config.yml
index 46ba6f99..d1cd5367 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -12,3 +12,10 @@ help_url: https://github.com/jekyll/jekyll-help
 collections:
   docs:
     output: true
+
+name: Jekyll • Simple, blog-aware, static sites
+description: Transform your plain text into static websites and blogs
+url: http://jekyllrb.com
+
+gems:
+  - jekyll-feed
diff --git a/site/_includes/top.html b/site/_includes/top.html
index 35ba2f26..2d12d1bd 100644
--- a/site/_includes/top.html
+++ b/site/_includes/top.html
@@ -5,7 +5,7 @@
   <title>{{ page.title }}</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <meta name="generator" content="Jekyll v{{ jekyll.version }}">
-  <link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml">
+  {% feed_meta %}
   <link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom">
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
   <link rel="stylesheet" href="/css/screen.css">
diff --git a/site/feed.xml b/site/feed.xml
deleted file mode 100644
index 1a683be1..00000000
--- a/site/feed.xml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-permalink: /feed.xml
----
-
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"
-  xmlns:content="http://purl.org/rss/1.0/modules/content/"
-  xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:atom="http://www.w3.org/2005/Atom"
-  xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-  xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
-  >
-  <channel>
-    <title xml:lang="en">Jekyll • Simple, blog-aware, static sites</title>
-    <atom:link type="application/atom+xml" href="http://jekyllrb.com/feed.xml" rel="self"/>
-    <link>http://jekyllrb.com/</link>
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <language>en-US</language>
-    <generator>Jekyll v{{ jekyll.version }}</generator>
-    <description>Transform your plain text into static websites and blogs.</description>
-    <image>
-      <description>Transform your plain text into static websites and blogs.</description>
-      <url>http://jekyllrb.com/img/logo-rss.png</url>
-      <title>Jekyll • Simple, blog-aware, static sites</title>
-      <link>http://jekyllrb.com/</link>
-      <width>144</width>
-      <height>73</height>
-    </image>
-    {% for post in site.posts %}
-    <item>
-      <title>{{ post.title | xml_escape}}</title>
-      <link>http://jekyllrb.com{{ post.url }}</link>
-      <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-      <dc:creator>{{ post.author }}</dc:creator>
-      {% for tag in post.tags %}
-      <category>{{ tag | xml_escape }}</category>
-      {% endfor %}
-      {% for cat in post.categories %}
-      <category>{{ cat | xml_escape }}</category>
-      {% endfor %}
-      <guid isPermaLink="true">http://jekyllrb.com{{ post.url }}</guid>
-      <description>{{ post.content | xml_escape }}</description>
-    </item>
-    {% endfor %}
-  </channel>
-</rss>