diff --git a/lynis b/lynis
index e2de13e1..78401f25 100755
--- a/lynis
+++ b/lynis
@@ -514,22 +514,27 @@ ${NORMAL}
     . ${INCLUDEDIR}/osdetection
     Display --indent 2 --text "- Detecting OS... " --result "${STATUS_DONE}" --color GREEN
 
-    # Check hostname and get timestamp
+    # Detect hostname and domain
+    FQDN=$(hostname 2> /dev/null)
     case ${OS} in
         HP-UX)
-                    HOSTNAME=$(hostname) ;;
+            HOSTNAME=$(hostname) ;;
+        Linux)
+            HOSTNAME=$(hostname -s 2> /dev/null)
+            if [ -z "${HOSTNAME}" ]; then
+                HOSTNAME="${FQDN:-no-hostname}"
+            fi
+            if [ "${HOSTNAME}" = "${FQDN}" ]; then
+                FQDN=$(hostname -f 2> /dev/null)
+            fi
+            ;;
         Solaris)
-                    HOSTNAME=$(uname -n) ;;
+            HOSTNAME=$(uname -n) ;;
         *)
-                    HOSTNAME=$(hostname -s 2> /dev/null) ;;
+            HOSTNAME=$(hostname -s 2> /dev/null) ;;
     esac
     if [ -z "${HOSTNAME}" ]; then
-        HOSTNAME=$(hostname 2> /dev/null)
-        if [ -z "${HOSTNAME}" ]; then HOSTNAME="no-hostname"; fi
-    fi
-    FQDN=$(hostname 2> /dev/null)
-    if [ "${OS}" = "Linux" -a "${HOSTNAME}" = "${FQDN}" ]; then
-        FQDN=$(hostname -f 2> /dev/null)
+        HOSTNAME="${FQDN:-no-hostname}"
     fi
 #
 #################################################################################