diff --git a/website/Gemfile b/website/Gemfile
index 99e3e69cce..936305b5e6 100644
--- a/website/Gemfile
+++ b/website/Gemfile
@@ -1,13 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "less",                  "~> 2.6"
-gem "middleman",             "~> 3.3"
-gem "middleman-minify-html", "~> 3.4"
-gem "rack-contrib",          "~> 1.1"
-gem "redcarpet",             "~> 3.1"
-gem "therubyracer",          "~> 0.12"
-gem "thin",                  "~> 1.6"
-
-group :development do
-  gem "highline", "~> 1.6"
-end
+gem 'middleman-hashicorp', github: 'hashicorp/middleman-hashicorp'
diff --git a/website/Gemfile.lock b/website/Gemfile.lock
index dd50f1eccc..381f6a3518 100644
--- a/website/Gemfile.lock
+++ b/website/Gemfile.lock
@@ -1,3 +1,20 @@
+GIT
+  remote: git://github.com/hashicorp/middleman-hashicorp.git
+  revision: 8df57150ef575bacc39b36da060b1f234433bf39
+  specs:
+    middleman-hashicorp (0.1.0)
+      bootstrap-sass (~> 3.2)
+      builder (~> 3.2)
+      less (~> 2.6)
+      middleman (~> 3.3)
+      middleman-livereload (~> 3.3)
+      middleman-minify-html (~> 3.4)
+      middleman-syntax (~> 2.0)
+      rack-contrib (~> 1.1)
+      redcarpet (~> 3.1)
+      therubyracer (~> 0.12)
+      thin (~> 1.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -7,6 +24,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    bootstrap-sass (3.2.0.2)
+      sass (~> 3.2)
+    builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     chunky_png (1.3.1)
@@ -28,18 +48,21 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     daemons (1.1.9)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (2.2.1)
     ffi (1.9.5)
     haml (4.0.5)
       tilt
-    highline (1.6.21)
     hike (1.2.3)
     hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
     htmlcompressor (0.1.2)
+    http_parser.rb (0.6.0)
     i18n (0.6.11)
     json (1.8.1)
     kramdown (1.4.2)
@@ -73,6 +96,10 @@ GEM
       rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
+    middleman-livereload (3.3.4)
+      em-websocket (~> 0.5.1)
+      middleman-core (~> 3.2)
+      rack-livereload (~> 0.3.15)
     middleman-minify-html (3.4.0)
       htmlcompressor (~> 0.1.0)
       middleman-core (>= 3.2)
@@ -81,6 +108,9 @@ GEM
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.2.0)
+    middleman-syntax (2.0.0)
+      middleman-core (~> 3.2)
+      rouge (~> 1.0)
     minitest (5.4.2)
     multi_json (1.10.1)
     padrino-helpers (0.12.3)
@@ -92,6 +122,8 @@ GEM
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
+    rack-livereload (0.3.15)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rb-fsevent (0.9.4)
@@ -99,6 +131,7 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     ref (1.0.5)
+    rouge (1.7.2)
     sass (3.4.5)
     sprockets (2.12.2)
       hike (~> 1.2)
@@ -133,11 +166,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  highline (~> 1.6)
-  less (~> 2.6)
-  middleman (~> 3.3)
-  middleman-minify-html (~> 3.4)
-  rack-contrib (~> 1.1)
-  redcarpet (~> 3.1)
-  therubyracer (~> 0.12)
-  thin (~> 1.6)
+  middleman-hashicorp!
diff --git a/website/config.rb b/website/config.rb
index ff63c0ec8b..6514afb1e6 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -2,21 +2,17 @@
 # Configure Middleman
 #-------------------------------------------------------------------------
 
-set :css_dir, 'stylesheets'
-set :js_dir, 'javascripts'
-set :images_dir, 'images'
+activate :hashicorp do |h|
+  h.version      = '0.4.0'
+  h.bintray_repo = 'mitchellh/consul'
+  h.bintray_user = 'mitchellh'
+  h.bintray_key  = ENV['BINTRAY_API_KEY']
 
-# Use the RedCarpet Markdown engine
-set :markdown_engine, :redcarpet
-set :markdown,
-    :fenced_code_blocks => true,
-    :with_toc_data => true
+  h.bintray_exclude_proc = Proc.new do |os, filename|
+    os == 'web'
+  end
+end
 
-# Build-specific configuration
-configure :build do
-  activate :asset_hash
-  activate :minify_html
-  activate :minify_javascript
 helpers do
   # This helps by setting the "active" class for sidebar nav elements
   # if the YAML frontmatter matches the expected value.
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
index 8a4833fb9b..9036e4db46 100644
--- a/website/source/downloads.html.erb
+++ b/website/source/downloads.html.erb
@@ -17,24 +17,22 @@ sidebar_current: "downloads-consul"
 			</p>
 		</div>
 	</div>
-	<% $consul_os.each do |os| %>
+	<% product_versions.each do |os, versions| %>
 		<div class="row">
-		<div class="col-md-12 download">
-			<div class="icon pull-left"><%= image_tag "/images/icons/icon_#{os}.png" %>
-		</div>
-			<div class="details">
-				<h2 class="os-name"><%= download_os_human(os) %></h2>
-				<ul>
-					<% $consul_files[os].each do |file| %>
-						<li><a href="<%= download_url(file) %>"><%= download_arch(file) %></a></li>
-				<% end %>
-				</ul>
-				<div class="clearfix">
-				</div>
-			</div>
-		</div>
-	</div>
-<% end %>
+  		<div class="col-md-12 download">
+  			<div class="icon pull-left"><%= system_icon(os) %></div>
+    		<div class="details">
+    			<h2 class="os-name"><%= os %></h2>
+    			<ul>
+    				<% versions.each do |url| %>
+    					<li><a href="<%= url %>"><%= arch_for_filename(url) %></a></li>
+    			  <% end %>
+    			</ul>
+    			<div class="clearfix"></div>
+    		</div>
+    	</div>
+    </div>
+  <% end %>
 
 	<div class="row">
 		<div class="col-md-12 poweredby">