diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28967f1..48f67f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changes
 
+## v0.6.0
+
+### Enhancements
+
+* [X509.PrivateKey] Allow encryption of PEM output
+* [X509.Test.Suite] Include 'localhost' in all certifictes
+* [X509.Test.Suite] Generate client certificate and associated key
+* [X509.Test.Server] Add 'client-cert' endpoint for testing with client
+  certificate
+* [`x509.gen.suite` Mix task] Add --force option
+* [`x509.gen.suite` Mix task] Add --password option
+* [`x509.gen.suite` Mix task] Generate 'ca_and_chain.pem' file
+* [`x509.gen.selfsigned` Mix task] Add --force option
+
 ## v0.5.4
 
 ### Enhancements
diff --git a/mix.exs b/mix.exs
index 3325206..9186091 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule X509.MixProject do
   use Mix.Project
 
-  @version "0.5.5"
+  @version "0.6.0"
 
   def project do
     [