diff --git a/site/_includes/top.html b/site/_includes/top.html
index fc016b47..a0312582 100644
--- a/site/_includes/top.html
+++ b/site/_includes/top.html
@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <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">
   <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">
diff --git a/site/feed.xml b/site/feed.xml
index 61b0f35c..1a683be1 100644
--- a/site/feed.xml
+++ b/site/feed.xml
@@ -11,25 +11,38 @@ permalink: /feed.xml
   xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
   xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
   >
-<channel>
+  <channel>
     <title xml:lang="en">Jekyll • Simple, blog-aware, static sites</title>
-    <atom:link type="application/atom+xml" href="http://jekyllrb.com/feed/" rel="self"/>
-    <link>http://jekyllrb.com</link>
-    <pubDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
-    <lastBuildDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
+    <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: "%a, %d %b %Y %H:%M:%S %z" }}</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="false">{{ post.id }}</guid>
-        <description><![CDATA[ {{ post.content }} ]]></description>
+      <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>
+  </channel>
 </rss>
diff --git a/site/img/logo-rss.png b/site/img/logo-rss.png
new file mode 100644
index 00000000..8a38383b
Binary files /dev/null and b/site/img/logo-rss.png differ