diff --git a/site/theme/en-US.js b/site/theme/en-US.js
index 6c38e2f73e..37c8907a83 100644
--- a/site/theme/en-US.js
+++ b/site/theme/en-US.js
@@ -27,6 +27,8 @@ module.exports = {
     'app.home.sub-slogan': 'A Little Happiness in Hand',
     'app.home.vision': 'This is a design language dedicated to improve the user and design experience.',
     'app.footer.repo': 'Repository',
+    'app.footer.awesome': 'Awesome Ant Design',
+    'app.footer.customize-theme': 'Customize Theme',
     'app.footer.scaffold': 'Scaffold',
     'app.footer.dev-tools': 'Developer Tools',
     'app.footer.dva': 'Framework',
@@ -35,10 +37,13 @@ module.exports = {
     'app.footer.data-vis': 'Data Visualization',
     'app.footer.motion': 'Motion Soluction',
     'app.footer.antd-library': 'Axure library',
-    'app.footer.material': 'Sitemap Template',
+    'app.footer.antux': 'Sitemap Template',
     'app.footer.community': 'Community',
     'app.footer.change-log': 'Change Log',
+    'app.footer.faq': 'FAQ',
     'app.footer.feedback': 'Feedback',
+    'app.footer.stackoverflow': 'StackOverflow',
+    'app.footer.segmentfault': 'SegmentFault',
     'app.footer.discuss': 'Chat Room',
     'app.footer.bug-report': 'Bug Report',
     'app.footer.version': 'Version: ',
diff --git a/site/theme/static/footer.less b/site/theme/static/footer.less
index c5bdcc082a..93dcc7c3bf 100644
--- a/site/theme/static/footer.less
+++ b/site/theme/static/footer.less
@@ -31,7 +31,7 @@ footer ul li > h2 {
     left: -22px;
     top: 3px;
     color: #aaa;
-  }
+  }  
 }
 
 footer ul li > div {
diff --git a/site/theme/template/Layout/Footer.jsx b/site/theme/template/Layout/Footer.jsx
index 2569112b57..f467ee2e1f 100644
--- a/site/theme/template/Layout/Footer.jsx
+++ b/site/theme/template/Layout/Footer.jsx
@@ -68,14 +68,14 @@ class Footer extends React.Component {
               </a>
             </div>
             <div>
-              <a target="_blank" rel="noopener noreferrer" href="https://github.com/dvajs/dva">dva</a> - <FormattedMessage id="app.footer.dva" />
+              <a target="_blank " href="https://ant.design/docs/react/customize-theme">
+                <FormattedMessage id="app.footer.customize-theme" />
+              </a>
             </div>
             <div>
-              <a target="_blank" rel="noopener noreferrer" href="https://github.com/dvajs/dva-cli">dva-cli</a> -
-              <FormattedMessage id="app.footer.scaffold" />
-            </div>
-            <div>
-              <a target="_blank" rel="noopener noreferrer" href="http://ant-tool.github.io">ant-tool</a> - <FormattedMessage id="app.footer.dev-tools" />
+              <a target="_blank " href="https://github.com/websemantics/awesome-ant-design">
+                <FormattedMessage id="app.footer.awesome" />
+              </a>
             </div>
           </li>
           <li>
@@ -85,6 +85,13 @@ class Footer extends React.Component {
               <span> - </span>
               <FormattedMessage id="app.footer.mobile" />
             </div>
+            <div>
+              <a target="_blank" rel="noopener noreferrer" href="https://github.com/dvajs/dva">dva</a> - <FormattedMessage id="app.footer.dva" />
+            </div>
+            <div>
+              <a target="_blank" rel="noopener noreferrer" href="https://github.com/dvajs/dva-cli">dva-cli</a> -
+              <FormattedMessage id="app.footer.dev-tools" />
+            </div>
             <div>
               <a href="https://antv.alipay.com/">AntV</a>
               <span> - </span>
@@ -103,7 +110,7 @@ class Footer extends React.Component {
             <div>
               <a href="http://ux.ant.design">Ant UX</a>
               <span> - </span>
-              <FormattedMessage id="app.footer.material" />
+              <FormattedMessage id="app.footer.antux" />
             </div>
           </li>
           <li>
@@ -114,8 +121,8 @@ class Footer extends React.Component {
               </a>
             </div>
             <div>
-              <a target="_blank" rel="noopener noreferrer" href="https://github.com/ant-design/ant-design/issues">
-                <FormattedMessage id="app.footer.feedback" />
+              <a target="_blank" rel="noopener noreferrer" href="https://github.com/ant-design/ant-design/wiki/FAQ">
+                <FormattedMessage id="app.footer.faq" />
               </a>
             </div>
             <div>
@@ -128,9 +135,22 @@ class Footer extends React.Component {
                 <FormattedMessage id="app.footer.bug-report" />
               </a>
             </div>
+            <div>
+              <a target="_blank" rel="noopener noreferrer" href="http://stackoverflow.com/questions/tagged/antd">
+                <FormattedMessage id="app.footer.stackoverflow" />
+              </a>
+            </div>
+            <div>
+              <a target="_blank" rel="noopener noreferrer" href="https://segmentfault.com/t/antd">
+                <FormattedMessage id="app.footer.segmentfault" />
+              </a>
+            </div>
           </li>
           <li>
-            <div>©2016 <FormattedMessage id="app.footer.author" /></div>
+            <h2>Copyright © 2017</h2>
+            <div>
+              <FormattedMessage id="app.footer.author" />
+            </div>
             <div>Built with <a href="https://github.com/benjycui/bisheng">BiSheng</a></div>
           </li>
         </ul>
diff --git a/site/theme/zh-CN.js b/site/theme/zh-CN.js
index f2583d5b34..37ba57b623 100644
--- a/site/theme/zh-CN.js
+++ b/site/theme/zh-CN.js
@@ -27,6 +27,8 @@ module.exports = {
     'app.home.sub-slogan': '微小·确定·幸福',
     'app.home.vision': '这是一套致力于提升『用户』和『设计者』使用体验的中后台设计语言。',
     'app.footer.repo': '仓库',
+    'app.footer.awesome': 'Awesome Ant Design',
+    'app.footer.customize-theme': '定制主题',
     'app.footer.scaffold': '脚手架',
     'app.footer.dev-tools': '开发工具',
     'app.footer.dva': '应用框架',
@@ -35,11 +37,14 @@ module.exports = {
     'app.footer.data-vis': '数据可视化',
     'app.footer.motion': '设计动效',
     'app.footer.antd-library': 'Axure 部件库',
-    'app.footer.material': '页面逻辑素材',
+    'app.footer.antux': '页面逻辑素材',
     'app.footer.community': '社区',
     'app.footer.change-log': '更新记录',
+    'app.footer.faq': '常见问题',
     'app.footer.feedback': '反馈和建议',
-    'app.footer.discuss': '讨论',
+    'app.footer.stackoverflow': 'StackOverflow',
+    'app.footer.segmentfault': 'SegmentFault',
+    'app.footer.discuss': '在线讨论',
     'app.footer.bug-report': '报告 Bug',
     'app.footer.version': '文档版本：',
     'app.footer.author': '蚂蚁金服体验技术部出品',