diff --git a/components/calendar/Header.jsx b/components/calendar/Header.jsx
index c0d06c3e47..f522fb4dcb 100644
--- a/components/calendar/Header.jsx
+++ b/components/calendar/Header.jsx
@@ -41,8 +41,8 @@ class Header extends Component {
 
     return (
       <Select
-        style={{ width: 70 }}
-        dropdownMenuStyle={{ minWidth: 100 }}
+        style={{ minWidth: 70 }}
+        dropdownMenuStyle={{ minWidth: 125 }}
         size={ fullscreen ? null : 'small' }
         dropdownMatchSelectWidth={false}
         className={`${prefixCls}-month-select`}
diff --git a/components/calendar/demo/locale.md b/components/calendar/demo/locale.md
new file mode 100644
index 0000000000..f5984bb883
--- /dev/null
+++ b/components/calendar/demo/locale.md
@@ -0,0 +1,20 @@
+# 国际化
+
+- order: 4
+
+通过 `locale` 配置时区、语言等, 默认支持 en_US, zh_CN
+
+---
+
+````jsx
+import { Calendar } from 'antd';
+import enUS from 'antd/lib/calendar/locale/en_US';
+
+function onPanelChange(value, mode) {
+  console.log(value, mode);
+}
+
+ReactDOM.render(
+  <Calendar onPanelChange={onPanelChange} locale={enUS}/>
+, document.getElementById('components-calendar-demo-locale'));
+````
diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx
index c77e024743..45c19a83a2 100644
--- a/components/calendar/index.jsx
+++ b/components/calendar/index.jsx
@@ -1,6 +1,6 @@
 import React, {PropTypes, Component} from 'react';
 import GregorianCalendar from 'gregorian-calendar';
-import zhCn from '../datepicker/locale/zh_CN';
+import zhCN from './locale/zh_CN';
 import FullCalendar from 'rc-calendar/lib/FullCalendar';
 import {PREFIX_CLS} from './Constants';
 import Header from './Header';
@@ -127,7 +127,7 @@ Calendar.propTypes = {
 Calendar.defaultProps = {
   monthCellRender: noop,
   dateCellRender: noop,
-  locale: zhCn,
+  locale: zhCN,
   fullscreen: true,
   prefixCls: PREFIX_CLS,
   onPanelChange: noop,
diff --git a/components/calendar/locale/en_US.js b/components/calendar/locale/en_US.js
new file mode 100644
index 0000000000..b2fd69dfec
--- /dev/null
+++ b/components/calendar/locale/en_US.js
@@ -0,0 +1 @@
+module.exports = require('../../datepicker/locale/en_US');
diff --git a/components/calendar/locale/zh_CN.js b/components/calendar/locale/zh_CN.js
new file mode 100644
index 0000000000..e54d3d1024
--- /dev/null
+++ b/components/calendar/locale/zh_CN.js
@@ -0,0 +1 @@
+module.exports = require('../../datepicker/locale/zh_CN');
diff --git a/components/datepicker/index.jsx b/components/datepicker/index.jsx
index ae14522bad..a0a646d17c 100644
--- a/components/datepicker/index.jsx
+++ b/components/datepicker/index.jsx
@@ -4,7 +4,6 @@ import MonthCalendar from 'rc-calendar/lib/MonthCalendar';
 import Datepicker from 'rc-calendar/lib/Picker';
 import GregorianCalendar from 'gregorian-calendar';
 import defaultLocale from './locale/zh_CN';
-import pickerEnUsLocale from './locale/en_US';
 import CalendarLocale from 'rc-calendar/lib/locale/zh_CN';
 import DateTimeFormat from 'gregorian-calendar-format';
 import objectAssign from 'object-assign';
@@ -165,10 +164,4 @@ const AntCalendar = React.createClass({
 AntDatePicker.Calendar = AntCalendar;
 AntDatePicker.MonthPicker = AntMonthPicker;
 
-// TODO. remove after https://github.com/ant-design/ant-design/issues/487
-AntDatePicker.locale = {
-  en_US: pickerEnUsLocale,
-  zh_CN: defaultLocale,
-};
-
 export default AntDatePicker;
diff --git a/components/pagination/index.jsx b/components/pagination/index.jsx
index 4bee94e123..015de3bb89 100644
--- a/components/pagination/index.jsx
+++ b/components/pagination/index.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import Pagination from 'rc-pagination';
 import Select from 'rc-select';
 import zhCN from './locale/zh_CN';
-import enUS from './locale/en_US';
 
 const prefixCls = 'ant-pagination';
 
@@ -23,10 +22,4 @@ AntPagination.defaultProps = {
   locale: zhCN,
 };
 
-// TODO. remove after https://github.com/ant-design/ant-design/issues/487
-AntPagination.locale = {
-  en_US: enUS,
-  zh_CN: zhCN,
-};
-
 export default AntPagination;
diff --git a/scripts/demo.js b/scripts/demo.js
index ede2f1ba1e..f2935c1f77 100644
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -11,6 +11,21 @@ window.React = React;
 window.ReactDOM = ReactDOM;
 window['object-assign'] = require('object-assign');
 
+antd.Datepicker.locale = {
+  en_US: require('../components/datepicker/locale/en_US'),
+  zh_CN: require('../components/datepicker/locale/zh_CN'),
+};
+
+antd.Calendar.locale = {
+  en_US: require('../components/calendar/locale/en_US'),
+  zh_CN: require('../components/calendar/locale/zh_CN'),
+};
+
+antd.Pagination.locale = {
+  en_US: require('../components/pagination/locale/en_US'),
+  zh_CN: require('../components/pagination/locale/zh_CN'),
+};
+
 InstantClickChangeFns.push(function () {
   // auto complete for components
   var Select = antd.Select;