diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 1f08961da..811fa8794 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,50 @@
## Changelog
+### 2.4.0 Fullerene
+
+*2018-05-28*
+
+#### New features
+- General
+ - Dev tool and bundler is switched to native webpack, #11216
+ - Now you can globally set the initial z-index of popups, #11257
+- Autocomplete
+ - Added `hide-loading` attribute, #11260
+- Button
+ - Now you can use the `size` attribute on circle buttons to control their sizes, #11275
+- InputNumber
+ - Added `precision` attribute, #11281
+- Tabs
+ - Added `before-leave` attribute, #11259
+ - Added `lazy` attribute, #11167（by @Kingwl）
+- Table
+ - Added `sort` method to manually sort the table, #11311
+
+#### Bug fixes
+- Input
+ - Fixed an issue that causes a re-render when using the Chinese IME to quickly input text, #11235 (by @STLighter)
+- Popover
+ - Fixed the console error when the triggering element is Radio or Checkbox, #11265
+- Breadcrumb
+ - Fixed the `to` attribute not supporting dynamic update, #11286
+- Upload
+ - Fixed the console error when a File is resolved in the returned Promise of the `beforeUpload` method, #11297 (by @qusiba)
+- Tooltip
+ - Fixed arrow not positioned correctly when content is empty, #11335
+- Autocomplete
+ - Fixed incorrect input suggestions after deleting keyword quickly, #11323
+- ColorPicker
+ - Fixed `active-change` event incorrectly triggering when picker dropdown is closed, #11304
+- Table
+ - Fixed style error of oversized filter panel, #11314
+ - Fixed currently selected row not retained when the table is sorted, #11348
+- Checkbox
+ - Fixed single checkbox not supporting validation, #11271
+- Radio
+ - Fixed disabled Radio still being selected when pressing space key, #11303
+- MessageBox
+ - Fixed the `el-popup-parent--hidden` class not removed when opening MessageBox in succession, #11371
+
### 2.3.9
*2018-05-18*
diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md
index 79a589dff..d07225f23 100644
--- a/CHANGELOG.es.md
+++ b/CHANGELOG.es.md
@@ -1,5 +1,50 @@
## Changelog
+### 2.4.0 Fullerene
+
+*2018-05-28*
+
+#### New features
+- General
+ - Dev tool and bundler is switched to native webpack, #11216
+ - Now you can globally set the initial z-index of popups, #11257
+- Autocomplete
+ - Added `hide-loading` attribute, #11260
+- Button
+ - Now you can use the `size` attribute on circle buttons to control their sizes, #11275
+- InputNumber
+ - Added `precision` attribute, #11281
+- Tabs
+ - Added `before-leave` attribute, #11259
+ - Added `lazy` attribute, #11167（by @Kingwl）
+- Table
+ - Added `sort` method to manually sort the table, #11311
+
+#### Bug fixes
+- Input
+ - Fixed an issue that causes a re-render when using the Chinese IME to quickly input text, #11235 (by @STLighter)
+- Popover
+ - Fixed the console error when the triggering element is Radio or Checkbox, #11265
+- Breadcrumb
+ - Fixed the `to` attribute not supporting dynamic update, #11286
+- Upload
+ - Fixed the console error when a File is resolved in the returned Promise of the `beforeUpload` method, #11297 (by @qusiba)
+- Tooltip
+ - Fixed arrow not positioned correctly when content is empty, #11335
+- Autocomplete
+ - Fixed incorrect input suggestions after deleting keyword quickly, #11323
+- ColorPicker
+ - Fixed `active-change` event incorrectly triggering when picker dropdown is closed, #11304
+- Table
+ - Fixed style error of oversized filter panel, #11314
+ - Fixed currently selected row not retained when the table is sorted, #11348
+- Checkbox
+ - Fixed single checkbox not supporting validation, #11271
+- Radio
+ - Fixed disabled Radio still being selected when pressing space key, #11303
+- MessageBox
+ - Fixed the `el-popup-parent--hidden` class not removed when opening MessageBox in succession, #11371
+
### 2.3.9
*2018-05-18*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index c6095d0d9..d74191a35 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,50 @@
## 更新日志
+### 2.4.0 Fullerene
+
+*2018-05-28*
+
+#### 新特性
+- 综合
+ - 使用原生 webpack 作为构建和打包工具，#11216
+ - 可以全局配置弹出层的初始 z-index，#11257
+- Autocomplete
+ - 新增 `hide-loading` 属性，#11260
+- Button
+ - 现在圆形按钮也支持通过 `size` 属性改变其尺寸了，#11275
+- InputNumber
+ - 新增 `precision` 属性，#11281
+- Tabs
+ - 新增 `before-leave` 钩子，#11259
+ - 新增 `lazy` 属性，#11167（by @Kingwl）
+- Table
+ - 新增 `sort` 方法，支持手动排序，#11311
+
+#### 修复
+- Input
+ - 修复使用中文输入法快速输入文字时会导致视图重新渲染的问题，#11235（by @STLighter）
+- Popover
+ - 修复当触发元素为 Radio 或 Checkbox 时控制台报错的问题，#11265
+- Breadcrumb
+ - 修复 `to` 属性不支持动态更新的问题，#11286
+- Upload
+ - 修复在 `beforeUpload` 方法返回的 Promise 中 resolve 一个 File 时控制台报错的问题，#11297（by @qusiba）
+- Tooltip
+ - 修复内容为空时箭头错位的问题，#11335
+- Autocomplete
+ - 修复在快速删除搜索内容后输入建议不正确的问题，#11323
+- ColorPicker
+ - 修复关闭选色器时触发 `active-change` 事件的问题，#11304
+- Table
+ - 修复筛选列表过长导致样式超出的问题，#11314
+ - 修复排序后导致无法正常显示选中行样式的问题，#11348
+- Checkbox
+ - 修复单个 Checkbox 不支持表单验证的问题，#11271
+- Radio
+ - 修复通过空格可以选中被禁用的 Radio 的问题，#11303
+- MessageBox
+ - 修复连续打开两个 MessageBox 时 `el-popup-parent--hidden` 无法移除的问题，#11371
+
### 2.3.9
*2018-05-18*
diff --git a/build/bin/version.js b/build/bin/version.js
index 5f6518313..4a75cde24 100644
--- a/build/bin/version.js
+++ b/build/bin/version.js
@@ -1,6 +1,6 @@
var fs = require('fs');
var path = require('path');
var version = process.env.VERSION || require('../../package.json').version;
-var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2' };
-if (!content[version]) content[version] = '2.3';
+var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3' };
+if (!content[version]) content[version] = '2.4';
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));
diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh
index ff4bef115..a3328c016 100644
--- a/build/deploy-ci.sh
+++ b/build/deploy-ci.sh
@@ -40,7 +40,7 @@ if [ "$TRAVIS_TAG" ]; then
# build sub folder
echo $TRAVIS_TAG
- SUB_FOLDER='2.3'
+ SUB_FOLDER='2.4'
mkdir $SUB_FOLDER
rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/**
diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh
index 7a29cbc01..ed6e892c4 100644
--- a/build/deploy-faas.sh
+++ b/build/deploy-faas.sh
@@ -5,7 +5,7 @@ cd temp_web
git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element
# build sub folder
-SUB_FOLDER='2.3'
+SUB_FOLDER='2.4'
mkdir $SUB_FOLDER
rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/**
diff --git a/examples/components/footer.vue b/examples/components/footer.vue
index 47c1cc513..1ac8f2340 100644
--- a/examples/components/footer.vue
+++ b/examples/components/footer.vue
@@ -21,7 +21,7 @@
Awesome Element