diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5abda7b4d..6707bfb48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+<a name="v2.18.0"></a>
+### v2.18.0 (2018-04-05)
+
+
+#### Features
+
+* add link to matrix from HTML pact page	 ([f9e3c23](/../../commit/f9e3c23))
+* sort tags in dashboard API response	 ([d2fd090](/../../commit/d2fd090))
+* add rake task to clean unused data to improve performance	 ([fc705a2](/../../commit/fc705a2))
+
+
+#### Bug Fixes
+
+* show JSON view when *any* error occurs creating the HTML view for a pact.	 ([e4342f0](/../../commit/e4342f0))
+* only show verification matrix number when verification is present	 ([766f7c0](/../../commit/766f7c0))
+* correctly display interaction with nil description in HTML view	 ([56528d3](/../../commit/56528d3))
+
+
 <a name="v2.17.1"></a>
 ### v2.17.1 (2018-03-30)
 
diff --git a/lib/pact_broker/version.rb b/lib/pact_broker/version.rb
index 1d1b8b61c..f9d9ca949 100644
--- a/lib/pact_broker/version.rb
+++ b/lib/pact_broker/version.rb
@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.17.1'
+  VERSION = '2.18.0'
 end