diff --git a/templates/article.html b/templates/article.html
index 61aa6ea..95cf39d 100755
--- a/templates/article.html
+++ b/templates/article.html
@@ -54,4 +54,22 @@
     </article>
 
     <hr>
+
+    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
+        <div class="comments">
+            <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+                var disqus_shortname = '{{ DISQUS_SITENAME }}';
+                var disqus_identifier = '{{ article.url }}';
+                var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+                (function() {
+                    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                    dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+                    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                })();
+            </script>
+            <noscript>Please enable JavaScript to view the comments.</noscript>
+        </div>
+    {% endif %}
 {% endblock content %}
diff --git a/templates/comments.html b/templates/comments.html
new file mode 100644
index 0000000..bb033c0
--- /dev/null
+++ b/templates/comments.html
@@ -0,0 +1 @@
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 388840e..e798b78 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -38,6 +38,7 @@
                     <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
                 {% endfor %}
                  on {{ article.locale_date }}
+                 {% include 'comments.html' %}
             </p>
         </div>
         <hr>