diff --git a/website/source/index.html.erb b/website/source/index.html.erb
index 070766ce7..6f09e3356 100644
--- a/website/source/index.html.erb
+++ b/website/source/index.html.erb
@@ -1,3 +1,7 @@
+---
+description: Service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.
+---
+
 <!-- Main jumbotron for a primary marketing message or call to action -->
 <div id="jumbotron-mask">
 	<div id="jumbotron">
diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb
index 1e2f4d44c..c364b4255 100644
--- a/website/source/layouts/_header.erb
+++ b/website/source/layouts/_header.erb
@@ -5,9 +5,7 @@
     <meta charset="utf-8">
 
     <title><%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Consul</title>
-    <meta name="description" content="Service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.">
-    <meta name="description" content="<%#= page_description %>" />
-    <meta name="keywords" content="<%#= (current_page.data.tags || ['Seth', 'Vargo', 'Chef', 'Ruby']).join(', ') %>" />
+    <meta name="description" content="<%= current_page.data.description %>" />
 
     <%= stylesheet_link_tag "application" %>