diff --git a/_config.yml b/_config.yml
index 1703e2592a0..411e9ed9fec 100644
--- a/_config.yml
+++ b/_config.yml
@@ -53,6 +53,12 @@ disqus_username: hux
 # Netease setttings
 netease_comment: false
 
+#gitalk:
+#    owner: 你
+#    repo: 评论仓库名称
+#    clientID: 申请的ID
+#    clientSecret: 申请的clientSecret
+#    admin: 名称
 
 
 # Analytics settings
diff --git a/_includes/comments.html b/_includes/comments.html
new file mode 100755
index 00000000000..1e6eb74bdf8
--- /dev/null
+++ b/_includes/comments.html
@@ -0,0 +1,15 @@
+<div id="gitalk-container"></div>
+<link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css">
+<script src="https://unpkg.com/gitalk/dist/gitalk.min.js"></script>
+<script>
+var gitalk = new Gitalk({
+    id: '{{ page.url }}',
+    clientID: '{{ site.gitalk.clientID }}',
+    clientSecret: '{{ site.gitalk.clientSecret }}',
+    repo: '{{ site.gitalk.repo }}',
+    owner: '{{ site.gitalk.owner }}',
+    admin: ['{{ site.gitalk.owner }}'], 
+	labels: ['Gitalk'],
+})
+gitalk.render('gitalk-container')
+</script>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index d9a138e0b62..fb0efac1326 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -98,6 +98,12 @@ <h2 class="subheading">{{ page.subtitle }}</h2>
                 </div>
                 <!-- disqus 评论框 end -->
                 {% endif %}
+                
+                {% if site.gitalk %}
+                <div class="comment">
+                    {% include comments.html %}
+                </div>
+                {% endif %}
 
                 {% if site.netease_comment %}
                 <!-- 网易云跟帖 评论框 start -->