diff --git a/README.rst b/README.rst
index cb24b91..7f41b2d 100644
--- a/README.rst
+++ b/README.rst
@@ -749,17 +749,30 @@ Links
 Version history
 =================
 
-0.17.0 - 2013.12.06
+0.18.0 - 2013.12.10
 --------------------
 
+- Optimizations. Kaa responds quicker than previous version.
+
+- Error highlighting javascipt attribute in html mode was fixed.
+
+- White space characters inserted by auto-indent are automatically removed if cursor moved to another position without entering a character.
+
+- reStructuredText Mode: Non-ASCII punctuations were not recognized as separater of inline mark ups.
+
+
+Past versions
+--------------
+
+0.17.0 - 2013.12.06
++++++++++++++++++++++
+
 - reStructuredText Mode: Recognize non-ASCII punctuation as separater of inline mark ups.
 
 - Indent command: Don't indent blank line. (Contributed by `allanderek <https://github.com/kaaedit/kaa/pull/94>`_)
 
 - Separate `kaadbg <https://pypi.python.org/pypi/kaadbg>`_ as new package.
 
-Past versions
---------------
 
 0.16.0 - 2013.12.03
 +++++++++++++++++++++
diff --git a/kaa/version.py b/kaa/version.py
index 9c05922..2bb7980 100644
--- a/kaa/version.py
+++ b/kaa/version.py
@@ -1,6 +1,6 @@
 import sys
 import os
-KAA_VERSION = (0, 17, 0)
+KAA_VERSION = (0, 18, 0)
 
 
 def version_info():
diff --git a/setup.py b/setup.py
index 727f6b6..5f0ac8c 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def read(fname):
 setup(
     cmdclass = cmdclass,
     name = "kaaedit",
-    version = "0.17.0",
+    version = "0.18.0",
     description='kaa - console text editor.',
     url='https://github.com/kaaedit/kaa',
     author='Atsuo Ishimoto',