diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f5e07af..04ddb09 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,7 +9,7 @@
 
 		{{ if .Site.DisqusShortname }}
 			<div class="col-xs-12">
-				{{ template "_internal/disqus.html" . }}
+				{{ partial "disqus.html" . }}
 			</div>
 		{{ end }}
 	</div>
diff --git a/layouts/doc/single.html b/layouts/doc/single.html
index 2b893f5..4eb0060 100644
--- a/layouts/doc/single.html
+++ b/layouts/doc/single.html
@@ -11,7 +11,7 @@
 
 			{{ if .Site.DisqusShortname }}
 				<div class="col-xs-12">
-					{{ template "_internal/disqus.html" . }}
+					{{ partial "disqus.html" . }}
 				</div>
 			{{ end }}
 		</div>
diff --git a/layouts/page/single.html b/layouts/page/single.html
index 2b893f5..4eb0060 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -11,7 +11,7 @@
 
 			{{ if .Site.DisqusShortname }}
 				<div class="col-xs-12">
-					{{ template "_internal/disqus.html" . }}
+					{{ partial "disqus.html" . }}
 				</div>
 			{{ end }}
 		</div>
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
new file mode 100644
index 0000000..05ff76a
--- /dev/null
+++ b/layouts/partials/disqus.html
@@ -0,0 +1,24 @@
+{{ if .Site.DisqusShortname }}
+	<div id="disqus_thread"></div>
+
+	<script type="text/javascript">
+		var disqus_shortname = '{{ .Site.DisqusShortname }}';
+		var disqus_identifier = '{{ .Permalink }}';
+		var disqus_title = '{{ .Title }}';
+		var disqus_url = '{{ .Permalink }}';
+
+		(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="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
+	</noscript>
+{{end}}
diff --git a/layouts/post/list.html b/layouts/post/list.html
index b8a6b55..288663e 100644
--- a/layouts/post/list.html
+++ b/layouts/post/list.html
@@ -51,7 +51,7 @@
 
 		{{ if .Site.DisqusShortname }}
 			<div class="col-xs-12">
-				{{ template "_internal/disqus.html" . }}
+				{{ partial "disqus.html" . }}
 			</div>
 		{{ end }}
 	</div>
diff --git a/layouts/post/single.html b/layouts/post/single.html
index c9b324d..b21ca68 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -28,7 +28,7 @@
 
 		{{ if .Site.DisqusShortname }}
 			<div class="col-xs-12">
-				{{ template "_internal/disqus.html" . }}
+				{{ partial "disqus.html" . }}
 			</div>
 		{{ end }}
 	</div>