diff --git a/_config.yml b/_config.yml
index f57c58bd27..72a2f5c0fa 100755
--- a/_config.yml
+++ b/_config.yml
@@ -389,6 +389,19 @@ valine:
 # You can get your uid from https://livere.com/insight/myCode (General web site)
 #livere_uid: your uid
 
+# Gitalk comment support.
+# Before using this you need to create a GitHub OAuth applicant.
+# See https://github.com/gitalk/gitalk.
+gitalk:
+  enable: false
+  clientID:
+  clientSecret:
+  repo: # Your repo name.
+  owner: # Your username.
+  admin: # Your username and other admins' username, support multiple admins split with comma, e.g. foo,bar.
+  pagerDirection: first # Start with the first comment.
+
+
 # Gitment
 # Introduction: https://imsun.net/posts/gitment-introduction/
 # You can get your Github ID from https://api.github.com/users/<Github username>
diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig
index cee31144c9..fb2758e21e 100644
--- a/layout/_partials/comments.swig
+++ b/layout/_partials/comments.swig
@@ -62,6 +62,11 @@
       {% endif %}
     </div>
 
+  {% elseif theme.gitalk.enable %}
+    <div class="comments" id="comments">
+      <div id="gitalk-container"></div>
+    </div>
+
   {% elseif theme.valine.appid and theme.valine.appkey %}
     <div class="comments" id="comments">
     </div>
diff --git a/layout/_third-party/comments/gitalk.swig b/layout/_third-party/comments/gitalk.swig
new file mode 100644
index 0000000000..d5c1bef171
--- /dev/null
+++ b/layout/_third-party/comments/gitalk.swig
@@ -0,0 +1,21 @@
+{% if not (theme.duoshuo and theme.duoshuo.shortname) and not theme.duoshuo_shortname %}
+  {% if theme.gitalk.enable %}
+    {% if page.comments %}
+      <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css">
+      <script src="https://unpkg.com/gitalk/dist/gitalk.min.js"></script>
+      <script type="text/javascript">
+        const gitalk = new Gitalk({
+          clientID: '{{ theme.gitalk.clientID }}',
+          clientSecret: '{{ theme.gitalk.clientSecret }}',
+          repo: '{{ theme.gitalk.repo }}',
+          owner: '{{ theme.gitalk.owner }}',
+          admin: '{{ theme.gitalk.admin}}'.split(','),
+          pagerDirection: '{{theme.gitalk.pagerDirection}}',
+          // facebook-like distraction free mode
+          distractionFreeMode: false
+        })
+        gitalk.render('gitalk-container')
+      </script>
+    {% endif %}
+  {% endif %}
+{% endif %}
diff --git a/layout/_third-party/comments/index.swig b/layout/_third-party/comments/index.swig
index b2da2320af..9e9e478385 100644
--- a/layout/_third-party/comments/index.swig
+++ b/layout/_third-party/comments/index.swig
@@ -5,4 +5,5 @@
 {% include 'livere.swig' %}
 {% include 'changyan.swig' %}
 {% include 'gitment.swig' %}
+{% include 'gitalk.swig' %}
 {% include 'valine.swig' %}