diff --git a/CHANGELOG.md b/CHANGELOG.md
index 716db8ed..88bf3472 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,16 +3,19 @@ Lynis Changelog
 
 Security notice: please run version 2.5.0 or later
 
+---------------------------------------------------------------------------------
 
-Lynis 2.5.1 (not released yet)
+Lynis 2.5.1 (2017-05-31)
 
 Changes:
 - Hebrew translation by Dolev Farhi
 - Improved detection of SSL certificate files
+- Minor changes to improve logging and results
 
 Tests:
 --------
 * BOOT-5104 - Added support for macOS
+* FIRE-4524 - Determine if CSF is in testing mode
 * HTTP-6716 - Improved log message
 
 ---------------------------------------------------------------------------------
diff --git a/lynis b/lynis
index e7cb3e48..1cb1288e 100755
--- a/lynis
+++ b/lynis
@@ -34,9 +34,9 @@
     PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com"
 
     # Version details
-    PROGRAM_RELEASE_DATE="2017-05-08"
-    PROGRAM_RELEASE_TIMESTAMP=1493796362
-    PROGRAM_RELEASE_TYPE="dev" # dev or final
+    PROGRAM_RELEASE_DATE="2017-05-31"
+    PROGRAM_RELEASE_TIMESTAMP=1496238458
+    PROGRAM_RELEASE_TYPE="final" # dev or final
     PROGRAM_VERSION="2.5.1"
 
     # Source, documentation and license