diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 27e93ad..0e1f4a3 100644
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -1,5 +1,8 @@
 <header>
   <% if(config.home) { %><a href="<%= config.home %>">Home</a> &middot;<% } %>
-  <a href="<%= config.root %>">Blog</a> &middot;
-  <a href="<%= url_for(config.feed.path) %>">Atom Feed</a>
+  <a href="<%= config.root %>">Blog</a>
+  <% if(config.feed) { %>
+  &middot;
+  <a href="<%= url_for(config.feed.path) %>"><%= (config.feed.type == "atom") ? "Atom" : "RSS" %> Feed</a>
+  <% } %>
 </header>
diff --git a/layout/_partial/root.ejs b/layout/_partial/root.ejs
index f9db9ea..0378456 100644
--- a/layout/_partial/root.ejs
+++ b/layout/_partial/root.ejs
@@ -11,8 +11,10 @@
     <link rel="stylesheet" type="text/css" href="<%= config.root + 'css/tufte_ext.css'%>">
     <link rel="stylesheet" type="text/css" href="<%= config.root + 'css/solarized_light.css'%>">
     <link href="//fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet" type="text/css">
+    <% if(config.feed) { %>
     <link rel="alternate" type="application/<%= config.feed.type %>+xml"
       title="<%= config.title %>" href="<%= url_for(config.feed.path) %>" />
+    <% } %>
   </head>
   <body>
     <%- partial('_partial/header') %>
