diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 3722a8fed..5d5f6c8e8 100644
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -84,7 +84,7 @@
   <%- partial('post/duoshuo', {
       key: post.slug,
       title: post.title,
-      url: config.url+url_for(post.path)
+      url: post.permalink
     }) %>
   <% } %>
   
@@ -92,7 +92,7 @@
   <%- partial('post/wangyiyun', {
       key: post.slug,
       title: post.title,
-      url: config.url+url_for(post.path)
+      url: post.permalink
     }) %>
   <% } %>
 
@@ -100,33 +100,23 @@
   <%- partial('post/changyan', {
       key: post.slug,
       title: post.title,
-      url: config.url+url_for(post.path)
+      url: post.permalink
     }) %>
   <% } %>
 
   <% if (theme.disqus || config.disqus_shortname){ %>
-    <section id="comments">
-      <div id="disqus_thread"></div>
-        <script type="text/javascript">
-        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-        var disqus_shortname = '<%= theme.disqus || config.disqus_shortname %>'; // required: replace example with your forum shortname
-
-        /* * * DON'T EDIT BELOW THIS LINE * * */
-        (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="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-    </section>
+  <%- partial('post/disqus', {
+      key: post.slug,
+      title: post.title,
+      url: post.permalink
+    }) %>
   <% } %>
 
   <% if (theme.gitment_owner && theme.gitment_repo &&theme.gitment_oauth && theme.gitment_oauth.client_id && theme.gitment_oauth.client_secret){ %>
   <%- partial('post/gitment', {
       key: post.slug,
       title: post.title,
-      url: config.url+url_for(post.path)
+      url: post.permalink
     }) %>
   <% } %>
 <% } %>
diff --git a/layout/_partial/post/disqus.ejs b/layout/_partial/post/disqus.ejs
new file mode 100644
index 000000000..8b7e820aa
--- /dev/null
+++ b/layout/_partial/post/disqus.ejs
@@ -0,0 +1,21 @@
+<section id="comments">
+  <div id="disqus_thread"></div>
+	<script>
+	var disqus_shortname = '<%= theme.disqus || config.disqus_shortname %>';
+
+	var disqus_config = function () {
+	this.page.identifier = '<%=key%>';
+	this.page.title = '<%=title%>';
+	this.page.url = '<%=url%>'; 
+	};
+	
+	(function() {
+	var d = document, s = d.createElement('script');
+	s.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
+	s.async = true;
+	s.setAttribute('data-timestamp', +new Date());
+	(d.head || d.body).appendChild(s);
+	})();
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+</section>
\ No newline at end of file