diff --git a/lynis b/lynis
index 4e65f4a9..f85dd91b 100755
--- a/lynis
+++ b/lynis
@@ -676,12 +676,14 @@ ${NORMAL}
         echo "  Operating system name:     ${OS_NAME}"
         echo "  Operating system version:  ${OS_VERSION}"
         LogText "EOL check: ${EOL}"
-        if [ ${EOL} -eq 1 ]; then
-            echo "  End-of-life:               ${WARNING}YES${NORMAL}"
+        if [ ${EOL} -eq 0 ]; then
+            echo "  End-of-life:               ${STATUS_NO}"
+        elif [ ${EOL} -eq 1 ]; then
+            echo "  End-of-life:               ${WARNING}${STATUS_YES}${NORMAL}"
             ReportWarning "GEN-0010" "This version ${OS_VERSION} is marked end-of-life as of ${EOL_DATE}"
         elif [ ${EOL} -eq 255 ]; then
-            # TODO - mark as item where community can provide help
-            LogText "Note: the end-of-life of '${OS_FULLNAME}' could not be checked. Entry missing in software-eol.db?"
+            echo "  End-of-life:               ${WARNING}${STATUS_UNKNOWN}${NORMAL}"
+            LogText "Note: the end-of-life of '${OS_FULLNAME}' could not be checked. Entry is missing in db/software-eol.db?"
         fi
 
         if [ -n "${OS_MODE}" ]; then echo "  Operating system mode:     ${OS_MODE}"; fi