diff --git a/website/Gemfile.lock b/website/Gemfile.lock
index 325143cfd..59b928395 100644
--- a/website/Gemfile.lock
+++ b/website/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/hashicorp/middleman-hashicorp
-  revision: b152b6436348e8e1f9990436228b25b4c5c6fcb8
+  revision: f21146d03182b7236b85ee8bc430fd613125d5bb
   specs:
-    middleman-hashicorp (0.1.0)
+    middleman-hashicorp (0.2.0)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       less (~> 2.6)
@@ -79,7 +79,7 @@ GEM
     kramdown (1.9.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.13)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
diff --git a/website/config.rb b/website/config.rb
index 5d0d0ec16..f8432d255 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -1,14 +1,7 @@
-#-------------------------------------------------------------------------
-# Configure Middleman
-#-------------------------------------------------------------------------
-
 set :base_url, "https://www.terraform.io/"
 
 activate :hashicorp do |h|
-  h.version         = ENV["TERRAFORM_VERSION"]
-  h.bintray_enabled = ENV["BINTRAY_ENABLED"]
-  h.bintray_repo    = "mitchellh/terraform"
-  h.bintray_user    = "mitchellh"
-  h.bintray_key     = ENV["BINTRAY_API_KEY"]
-  h.github_slug     = "hashicorp/terraform"
+  h.name        = "terraform"
+  h.version     = "0.6.6"
+  h.github_slug = "hashicorp/terraform"
 end
diff --git a/website/source/assets/images/fastly_logo.png b/website/source/assets/images/fastly_logo.png
new file mode 100644
index 000000000..0c4619e96
Binary files /dev/null and b/website/source/assets/images/fastly_logo.png differ
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
index 1eb63cc22..a979e2772 100644
--- a/website/source/downloads.html.erb
+++ b/website/source/downloads.html.erb
@@ -9,46 +9,50 @@ description: |-
 <h1>Download Terraform</h1>
 
 <section class="downloads">
-	<div class="description row">
-		<div class="col-md-12">
-			<p>
-			Below are all available downloads for the latest version of Terraform
-			(<%= latest_version %>). Please download the proper package for your
-			operating system and architecture. You can find SHA256 checksums
-			for packages <a href="https://dl.bintray.com/mitchellh/terraform/terraform_<%= latest_version %>_SHA256SUMS?direct">here</a>.
-			</p>
+  <div class="description row">
+    <div class="col-md-12">
+      <p>
+        Below are the available downloads for the latest version of Terraform
+        (<%= latest_version %>). Please download the proper package for your
+        operating system and architecture.
+      </p>
+      <p>
+        You can find the
+        <a href="https://releases.hashicorp.com/terraform/<%= latest_version %>/terraform_<%= latest_version %>_SHA256SUMS">
+          SHA256 checksums for Terraform <%= latest_version %>
+        </a>
+        online and you can
+        <a href="https://releases.hashicorp.com/terraform/<%= latest_version %>/terraform_<%= latest_version %>_SHA256SUMS.sig">
+          verify the checksums signature file
+        </a>
+        which has been signed using <a href="https://hashicorp.com/security.html" target="_TOP">HashiCorp's GPG key</a>.
+        You can also <a href="https://releases.hashicorp.com/terraform" target="_TOP">download older versions of Terraform</a> from the releases service.
+      </p>
+    </div>
+  </div>
 
-			<p>
-			Each release archive is a <code>zip</code> file containing the Terraform binary
-			executables at the top level. These executables are meant to be extracted
-			to a location where they can be found by your shell.
-			</p>
-		</div>
-	</div>
-	<% product_versions.each do |os, versions| %>
-		<div class="row">
-		<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 %>
+  <% product_versions.each do |os, arches| %>
+    <div class="row">
+      <div class="col-md-12 download">
+        <div class="icon pull-left"><%= system_icon(os) %></div>
+        <div class="details">
+          <h2 class="os-name"><%= pretty_os(os) %></h2>
+          <ul>
+            <% arches.each do |arch, url| %>
+              <li><a href="<%= url %>"><%= pretty_arch(arch) %></a></li>
+            <% end %>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+    </div>
+  <% end %>
 
-	<div class="row">
-		<div class="col-md-12 poweredby">
-			<a href='http://www.bintray.com'>
-				<img src='https://www.bintray.com/docs/images/poweredByBintray_ColorTransparent.png'>
-			</a>
-		</div>
-	</div>
+  <div class="row">
+    <div class="col-md-12 poweredby">
+      <a href="https://www.fastly.com?utm_source=hashicorp" target="_TOP">
+        <%= image_tag "fastly_logo.png" %>
+      </a>
+    </div>
+  </div>
 </section>