diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea5d361..399f4d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ http://pois.elblogdehumitos.com.ar/master/
 
 **Date:** not released yet
 
+ - Comments for all the POIs using disqus threads (#43)
+
 ## Version 0.3
 
 **Date:** 01/15/2015
diff --git a/web/assets/js/site.js b/web/assets/js/site.js
index 3e138e2..e35b841 100644
--- a/web/assets/js/site.js
+++ b/web/assets/js/site.js
@@ -179,13 +179,13 @@ function callback(data) {
 	    iconSize: [32, 37],
 	    iconAnchor: [18.5, 35],
 	    popupAnchor: [0, -27]
-        });
-        var marker = L.marker(pos, {
-            icon: markerIcon,
-            keyboard: false
-        })
+	});
+	var marker = L.marker(pos, {
+	    icon: markerIcon,
+	    keyboard: false
+	})
 
-        // show a label next to the icon on mouse hover
+	// show a label next to the icon on mouse hover
 	if (e.tags.name) {
 	    marker.bindLabel(
 		e.tags.name,
@@ -198,6 +198,17 @@ function callback(data) {
 	marker.on('click', function(e) {
 	    var element = e.target._element;
 	    $('#developer > .tags').html(develop_parser(element));
+
+	    var name = element.tags.name ? element.tags.name : element.id;
+	    $('#comments #comment-name').html(name);
+	    // reload disqus thread
+	    DISQUS.reset({
+		reload: true,
+		config: function () {
+		    this.page.identifier = element.id;
+		    this.page.url = 'http://pois.elblogdehumitos.com.ar/#!' + element.id;
+		}
+	    });
 	});
 
 	if (poi.tagParser) var markerPopup = poi.tagParser(e);
diff --git a/web/assets/js/tags-parsers.js b/web/assets/js/tags-parsers.js
index c3011ae..5d022c1 100644
--- a/web/assets/js/tags-parsers.js
+++ b/web/assets/js/tags-parsers.js
@@ -189,5 +189,9 @@ function parse_tags(element, titlePopup, functions) {
 	    markerPopup += data.callback(element);
 	}
     }
+
+    markerPopup += '<br> <span class="fa fa-comments"></span> ';
+    markerPopup += '<a href="#" onclick="javascript: sidebar.open(\'comments\'); return false;">Ver comentarios</a>';
+
     return markerPopup;
 }
diff --git a/web/index.html b/web/index.html
index a8281f8..2f5ec45 100644
--- a/web/index.html
+++ b/web/index.html
@@ -261,8 +261,7 @@ <h1>Herramientas usadas</h1>
 	<div class="sidebar-pane" id="comments">
 	  <div class="close-button"><span class="fa fa-close" onclick="javascript: sidebar.close()"></span></div>
 	  <h1>Comentarios</h1>
-	  <p>¿Errores? ¿Ideas? ¿Sugerencias?</p>
-	  <p>¡Dejanos tus comentarios!</p>
+	  <p>¡Dejá un comentario para <strong id="comment-name">nuestro website</strong>!</p>
 	  <div id="disqus_thread"></div>
 	  <script type="text/javascript">
 	    var disqus_shortname = 'osmpois'; // required: replace example with your forum shortname
@@ -335,6 +334,5 @@ <h1>Modo experto</h1>
     </script>
     <noscript><p><img src="//elblogdehumitos.com.ar/piwik/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
     <!-- End Piwik Code -->
-
   </body>
 </html>