diff --git a/ChangeLog b/ChangeLog
index 668bf10..c6d725d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Release 0.3.18 - 2015/04/02
+* [fixed] #167 Apply bootstrap css to inputboxes in signin form
+* [fixed] #168 Fix the behavor mismatch between configtest and update (update failed but configtest is OK)
+
 Release 0.3.17 - 2015/04/01
 * [fixed] #164 Display add/remove icons correctly in out_forward settings page
 * [fixed] #165 Fix zombie process is created by clicking start button in dashboard
diff --git a/lib/fluentd-ui/version.rb b/lib/fluentd-ui/version.rb
index 0c5f13e..0862dd1 100644
--- a/lib/fluentd-ui/version.rb
+++ b/lib/fluentd-ui/version.rb
@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
 end