diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04cc7a865..a8a32b84e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# v1.6.0
+
+* Avoid dropping elements in the render_inline test helper.
+
+    *@dark-panda*
+
+* Add test for helpers.asset_url.
+
+    *Christopher Coleman*
+
+* Add rudimentary compatibility with better_html.
+
+    *Joel Hawksley*
+
+* Template-less variants fall back to default template.
+
+    *Asger Behncke Jacobsen*, *Cesario Uy*
+
+* Generated tests use new naming convention.
+
+    *Simon Træls Ravn*
+
+* Eliminate sqlite dependency.
+
+    *Simon Dawson*
+
+* Add support for rendering components via #to_component_class
+
+    *Vinicius Stock*
+
 # v1.5.3
 
 * Add support for RSpec to generators.
diff --git a/Gemfile.lock b/Gemfile.lock
index e5d73b4fb..9131e8ce9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    actionview-component (1.5.3)
+    actionview-component (1.6.0)
 
 GEM
   remote: https://rubygems.org/
diff --git a/lib/action_view/component/version.rb b/lib/action_view/component/version.rb
index 73f74116a..9b6f146ad 100644
--- a/lib/action_view/component/version.rb
+++ b/lib/action_view/component/version.rb
@@ -4,8 +4,8 @@ module ActionView
   module Component
     module VERSION
       MAJOR = 1
-      MINOR = 5
-      PATCH = 3
+      MINOR = 6
+      PATCH = 0
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end