diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429932f..bbaa0e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.5.9](https://github.com/dev-sec/ssh-baseline/tree/2.5.9) (2020-07-04)
+
+[Full Changelog](https://github.com/dev-sec/ssh-baseline/compare/2.5.8...2.5.9)
+
+**Merged pull requests:**
+
+- ssh host keys in a specific directory [\#174](https://github.com/dev-sec/ssh-baseline/pull/174) ([micheelengronne](https://github.com/micheelengronne))
+
 ## [2.5.8](https://github.com/dev-sec/ssh-baseline/tree/2.5.8) (2020-06-18)
 
 [Full Changelog](https://github.com/dev-sec/ssh-baseline/compare/2.5.7...2.5.8)
@@ -69,7 +77,6 @@
 **Merged pull requests:**
 
 - changelog only triggered when release [\#162](https://github.com/dev-sec/ssh-baseline/pull/162) ([micheelengronne](https://github.com/micheelengronne))
-- sshd\_config custom path [\#161](https://github.com/dev-sec/ssh-baseline/pull/161) ([micheelengronne](https://github.com/micheelengronne))
 - Continously updated changelog [\#160](https://github.com/dev-sec/ssh-baseline/pull/160) ([micheelengronne](https://github.com/micheelengronne))
 
 ## [2.5.1](https://github.com/dev-sec/ssh-baseline/tree/2.5.1) (2020-05-18)
@@ -78,6 +85,7 @@
 
 **Merged pull requests:**
 
+- sshd\_config custom path [\#161](https://github.com/dev-sec/ssh-baseline/pull/161) ([micheelengronne](https://github.com/micheelengronne))
 - Align versions everywhere in the project [\#159](https://github.com/dev-sec/ssh-baseline/pull/159) ([micheelengronne](https://github.com/micheelengronne))
 
 ## [2.5.0](https://github.com/dev-sec/ssh-baseline/tree/2.5.0) (2020-05-18)
diff --git a/inspec.yml b/inspec.yml
index b7324d4..154dc1c 100644
--- a/inspec.yml
+++ b/inspec.yml
@@ -6,6 +6,6 @@ copyright: DevSec Hardening Framework Team
 copyright_email: hello@dev-sec.io
 license: Apache-2.0
 summary: Test-suite for best-practice SSH hardening
-version: 2.5.8
+version: 2.5.9
 supports:
     - os-family: unix