diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 39d1773..1f75863 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+1.18.0 (2019-10-15)
+-------------------
+
+- Lint ``.yamllint`` config file by default
+- Also read config from ``.yamllint.yml`` and ``.yamllint.yaml``
+- Improve documentation for ``yaml-files``
+- Update documentation for ``pre-commit``
+- Explicitly disable ``empty-values`` and ``octal-values`` rules
+
 1.17.0 (2019-08-12)
 -------------------
 
diff --git a/yamllint/__init__.py b/yamllint/__init__.py
index 12be7f1..263b73e 100644
--- a/yamllint/__init__.py
+++ b/yamllint/__init__.py
@@ -22,7 +22,7 @@ indentation, etc."""
 
 
 APP_NAME = 'yamllint'
-APP_VERSION = '1.17.0'
+APP_VERSION = '1.18.0'
 APP_DESCRIPTION = __doc__
 
 __author__ = u'Adrien Vergé'