diff --git a/app/controllers/wh/settings/data.js b/app/controllers/wh/settings/data.js
index 0a5c613d..a525142d 100644
--- a/app/controllers/wh/settings/data.js
+++ b/app/controllers/wh/settings/data.js
@@ -8,6 +8,8 @@ export default Ember.Controller.extend({
   isDeleting: false,
 
   isIndexing: false,
+  downloadLink: '',
+  downloadFileName: '',
 
   dataBreakdown: function () {
 
diff --git a/app/routes/wh/settings/data.js b/app/routes/wh/settings/data.js
index e4f45891..edb9c1ce 100644
--- a/app/routes/wh/settings/data.js
+++ b/app/routes/wh/settings/data.js
@@ -25,6 +25,9 @@ export default Ember.Route.extend({
     controller.set('deleteOption', 'data');
     controller.set('wordpressFile', null);
 
+    controller.set('downloadLink', window.ENV.uploadUrl + 'download/?site=' +this.get('session.site.name') + '&token=' + this.get('session.site.token'));
+    controller.set('downloadFileName', this.get('buildEnvironment').siteName);
+
     return this._super.apply(this, arguments);
   }
 });
diff --git a/app/templates/components/webhook-blog.hbs b/app/templates/components/webhook-blog.hbs
index 623f50a8..1281f3a1 100644
--- a/app/templates/components/webhook-blog.hbs
+++ b/app/templates/components/webhook-blog.hbs
@@ -3,7 +3,7 @@
   <ul>
   {{#each post in posts}}
     <li>
-      <a href="http://www.webhook.com/blog/{{unbound post.slug}}">
+      <a href="http://www.webhook.com/{{unbound post.slug}}">
         <h4>{{post.name}}</h4>
         <p>{{post.short_version}}</p>
         <p class="date">{{format-time post.publish_date}}</p>
diff --git a/app/templates/wh/settings/data.hbs b/app/templates/wh/settings/data.hbs
index af2049d2..58af782c 100644
--- a/app/templates/wh/settings/data.hbs
+++ b/app/templates/wh/settings/data.hbs
@@ -83,7 +83,7 @@
 </section>
 
 <section class="wh-content-edit">
-
+  <h4>Data backups</h4>
   <p>
     Webhook automatically exports a JSON backup every night at 3AM PST. We keep these files around for seven days.
     For new sites, the backups will only work for the days after your site was created.
@@ -95,6 +95,13 @@
     {{/each}}
   </ul>
 
+  <h4>Template and site files backup</h4>
+  {{#unless buildEnvironment.selfHosted }}
+    <p>This will download your Webhook site directory including all the templates and static files as they exist on the live website. You can use these files to recreate your site locally if need be.</p>
+
+    <a class="btn btn-neutral icon icon-download"  {{bind-attr download=downloadFileName}} {{bind-attr href=downloadLink}}> Download your website files</a>
+  {{/unless}}
+
 </section>