diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11811b2b..00b6075c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Lynis Changelog
 ===============
 
+Lynis 2.6.5 (not released yet)
+
+Tests:
+------
+
+* [SSH-7402]  - improved test to allow configurations with a Match block
+
+---------------------------------------------------------------------------------
+
 Lynis 2.6.4 (2018-05-02)
 
 Changes:
diff --git a/lynis b/lynis
index d39fcea4..02cd68e0 100755
--- a/lynis
+++ b/lynis
@@ -35,10 +35,10 @@
     PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com"
 
     # Version details
-    PROGRAM_RELEASE_DATE="2018-05-02"
+    PROGRAM_RELEASE_DATE="2018-05-14"
     PROGRAM_RELEASE_TIMESTAMP=1525260871
-    PROGRAM_RELEASE_TYPE="final" # dev or final
-    PROGRAM_VERSION="2.6.4"
+    PROGRAM_RELEASE_TYPE="dev" # dev or final
+    PROGRAM_VERSION="2.6.5"
 
     # Source, documentation and license
     PROGRAM_SOURCE="https://github.com/CISOfy/lynis"