diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml
index 03339e96..40328cab 100644
--- a/doc-src/layouts/main.haml
+++ b/doc-src/layouts/main.haml
@@ -28,7 +28,9 @@
               %input#search{:name => "q", :type => "text", :value => ""}
     - if @item[:content_for_module_nav]
       %nav#module-nav= @item[:content_for_module_nav]
-    #page= yield
+    #page
+      = yield
+      = render "partials/disqus_comments"
     #wrap-footer
   %footer(role="contentinfo")= render "partials/footer"
   %script(src="/docs/javascripts/jquery-1.3.2.min.js")
diff --git a/doc-src/layouts/partials/analytics.haml b/doc-src/layouts/partials/analytics.haml
new file mode 100644
index 00000000..fee2992b
--- /dev/null
+++ b/doc-src/layouts/partials/analytics.haml
@@ -0,0 +1,18 @@
+:plain
+  <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try {
+  var pageTracker = _gat._getTracker("UA-6779438-1");
+  pageTracker._trackPageview();
+  } catch(err) {}</script>
+  <script type="text/javascript">
+  var disqus_shortname = 'compassbetadocs';
+  (function () {
+    var s = document.createElement('script'); s.async = true;
+    s.src = 'http://disqus.com/forums/compassbetadocs/count.js';
+    (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+  }());
+  </script>
diff --git a/doc-src/layouts/partials/analytics.html b/doc-src/layouts/partials/analytics.html
deleted file mode 100644
index 7887b3a6..00000000
--- a/doc-src/layouts/partials/analytics.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-6779438-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
diff --git a/doc-src/layouts/partials/disqus_comments.haml b/doc-src/layouts/partials/disqus_comments.haml
new file mode 100644
index 00000000..a085dadd
--- /dev/null
+++ b/doc-src/layouts/partials/disqus_comments.haml
@@ -0,0 +1,11 @@
+:plain
+  <div id="disqus_thread"></div>
+  <script type="text/javascript">
+     var disqus_identifier = "#{item.identifier}";
+    (function() {
+     var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+     dsq.src = 'http://compassbetadocs.disqus.com/embed.js';
+     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=compassbetadocs">comments powered by Disqus.</a></noscript>