diff --git a/alchemy/templates/include/comments.html b/alchemy/templates/include/comments.html
new file mode 100644
index 0000000..bc3235c
--- /dev/null
+++ b/alchemy/templates/include/comments.html
@@ -0,0 +1,18 @@
+{% if DISQUS_SITENAME %}
+<div id="disqus_thread"></div>
+<script>
+  var disqus_config = function () {
+    this.page.url = '{{ SITEURL }}/{{ output_file }}';
+    this.page.identifier = '{{ article.slug }}';
+  };
+  (function() {
+    var d = document, s = d.createElement('script');
+    s.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+    s.setAttribute('data-timestamp', +new Date());
+    (d.head || d.body).appendChild(s);
+  })();
+</script>
+<noscript>
+  Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a>
+</noscript>
+{% endif %}
diff --git a/alchemy/templates/include/disqus_comments.html b/alchemy/templates/include/disqus_comments.html
deleted file mode 100644
index c05186e..0000000
--- a/alchemy/templates/include/disqus_comments.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% if DISQUS_SITENAME %}
-  <div id="disqus_thread">
-    <script>
-      var disqus_shortname = '{{ DISQUS_SITENAME }}';
-      (function() {
-        var dsq = document.createElement('script');
-        dsq.type = 'text/javascript';
-        dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] ||
-         document.getElementsByTagName('body')[0]).appendChild(dsq);
-      })();
-    </script>
-    <noscript>
-      Please enable JavaScript to view the
-      <a href="https://disqus.com/?ref_noscript={{ DISQUS_SITENAME }}">
-        comments powered by Disqus.
-      </a>
-    </noscript>
-    <a href="https://disqus.com" class="dsq-brlink">
-      blog comments powered by <span class="logo-disqus">Disqus</span>
-    </a>
-  </div>
-{% endif %}
diff --git a/alchemy/templates/include/google_analytics.html b/alchemy/templates/include/google_analytics.html
deleted file mode 100644
index 629d932..0000000
--- a/alchemy/templates/include/google_analytics.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if GOOGLE_ANALYTICS_ID %}
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ GOOGLE_ANALYTICS_ID }}', 'auto');
-    ga('send', 'pageview');
-
-  </script>
-{% endif %}