diff --git a/Felipe Martin.lektorproject b/Felipe Martin.lektorproject
index 6922e9e..3c370e8 100644
--- a/Felipe Martin.lektorproject	
+++ b/Felipe Martin.lektorproject	
@@ -2,7 +2,6 @@
 name = Felipe Martin
 
 [packages]
-lektor-disqus-comments = 0.2
 lektor-markdown-highlighter = 0.1
 
 [servers.production]
diff --git a/configs/disqus-comments.ini b/configs/disqus-comments.ini
deleted file mode 100644
index ecd4fdb..0000000
--- a/configs/disqus-comments.ini
+++ /dev/null
@@ -1 +0,0 @@
-shortname = fmartingr
\ No newline at end of file
diff --git a/templates/blog/post.html b/templates/blog/post.html
index 07174da..22cae00 100644
--- a/templates/blog/post.html
+++ b/templates/blog/post.html
@@ -8,7 +8,9 @@
 {% block main_content %}
   {{ render_blog_post(this) }}
   {% if this.comments_enabled %}
-    <div class="center comments">{{ render_disqus_comments() }}</div>
+    <div class="comments center" id="disqus_thread"></div>
+    {% from 'macros/comments.html' import disqus with context %}
+    {{ disqus() }}
   {% else %}
     <div class="center info">
       Comments have been disabled in this post, if you want to contact me please <a href="{{ '/contact'|url }}">go ahead</a>!
diff --git a/templates/macros/blog.html b/templates/macros/blog.html
index 336e0a8..54f0bdd 100644
--- a/templates/macros/blog.html
+++ b/templates/macros/blog.html
@@ -3,7 +3,7 @@
   <article class="blog-post center">
     <h1><a href="{{ post|url }}">{{ post.title }}</a></h1>
     <div class="info">
-      Published on {{ post.pub_date }} with <a href="#">no comments.</a>
+      Published on {{ post.pub_date }} with <a href="#disqus_thread">no comments.</a>
     </div>
     <div class="content">
       {% if from_index and summary|length > 1 %}
diff --git a/templates/macros/comments.html b/templates/macros/comments.html
new file mode 100644
index 0000000..59ff5a0
--- /dev/null
+++ b/templates/macros/comments.html
@@ -0,0 +1,20 @@
+{% macro disqus(shortname) -%}
+<script type="text/javascript">
+var disqus_shortname = 'fmartingr';
+
+// Embed
+(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);
+})();
+
+// Count
+(function () {
+var s = document.createElement('script'); s.async = true;
+s.type = 'text/javascript';
+s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+}());
+</script>
+{%- endmacro %}