diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index ca7d41a..78c91c5 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,8 +5,6 @@
 	<div class="container is-centered page">
 		<div class=" content">
 			{{ .Content }}
-
-			{{ partial "disqus.html" . }}
 		</div>
 	</div>
 </section>
diff --git a/layouts/page/single.html b/layouts/page/single.html
index 3ccff1c..830fd38 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -10,8 +10,6 @@
 			<div class="column">
 				<div class=" content">
 					{{ .Content }}
-
-					{{ partial "disqus.html" . }}
 				</div>
 			</div>
 		</div>
diff --git a/layouts/partials/discourse.html b/layouts/partials/discourse.html
new file mode 100644
index 0000000..5359364
--- /dev/null
+++ b/layouts/partials/discourse.html
@@ -0,0 +1,14 @@
+<div id="discourse-comments"></div>
+
+<script type="text/javascript">
+DiscourseEmbed = {
+    discourseUrl: "https://discourse.gitea.io/",
+    discourseEmbedUrl: {{ .Permalink }}
+};
+
+(function() {
+    var d = document.createElement("script"); d.type = "text/javascript"; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + "javascripts/embed.js";
+    (document.getElementsByTagName("head")[0] || document.getElementsByTagName("body")[0]).appendChild(d);
+})();
+</script>
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
deleted file mode 100644
index 05ff76a..0000000
--- a/layouts/partials/disqus.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{{ 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/single.html b/layouts/post/single.html
index a6704b8..38a55bb 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -21,7 +21,7 @@
 
 			{{ .Content }}
 
-			{{ partial "disqus.html" . }}
+			{{ partial "discourse.html" . }}
 		</div>
 	</div>
 </section>