diff --git a/ChangeLog b/ChangeLog
index 76932e327..e769d163f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Version 0.18
+
+ * Fix JIRA service editing for GitLab 8.14+
+ * Add jira_issue_transition_id to the JIRA service optional fields
+ * Added support for Snippets (new API in Gitlab 8.15)
+ * [docs] update pagination section
+ * [docs] artifacts example: open file in wb mode
+ * [CLI] ignore empty arguments
+ * [CLI] Fix wrong use of arguments
+ * [docs] Add doc for snippets
+ * Fix duplicated data in API docs
+ * Update known attributes for projects
+ * sudo: always use strings
+
 Version 0.17
 
  * README: add badges for pypi and RTD
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 679b023d2..e0051aafd 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -34,7 +34,7 @@
 from gitlab.objects import *  # noqa
 
 __title__ = 'python-gitlab'
-__version__ = '0.17'
+__version__ = '0.18'
 __author__ = 'Gauvain Pocentek'
 __email__ = 'gauvain@pocentek.net'
 __license__ = 'LGPL3'