diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47d6e83b..3c3b0854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Lynis Changelog
 ===============
 
-Lynis 2.5.8 (not released yet)
+Lynis 2.5.8 (2017-12-28)
 
 Changes:
 --------
diff --git a/lynis b/lynis
index 7c2fd33d..7077bfeb 100755
--- a/lynis
+++ b/lynis
@@ -35,9 +35,9 @@
     PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com"
 
     # Version details
-    PROGRAM_RELEASE_DATE="2017-10-29"
-    PROGRAM_RELEASE_TIMESTAMP=1509268838
-    PROGRAM_RELEASE_TYPE="dev" # dev or final
+    PROGRAM_RELEASE_DATE="2017-12-28"
+    PROGRAM_RELEASE_TIMESTAMP=1514461655
+    PROGRAM_RELEASE_TYPE="final" # dev or final
     PROGRAM_VERSION="2.5.8"
 
     # Source, documentation and license