diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -32,11 +32,8 @@ class General(Plugin):
             "/etc/os-release"
         ])
 
-        self.add_cmd_output(
-            "hostname -f",
-            root_symlink="hostname",
-            suggest_filename="hostname"
-        )
+        self.add_cmd_output("hostname -f")
+        self.add_cmd_output("hostname", root_symlink=hostname)
 
         self.add_cmd_output("date", root_symlink="date")
         self.add_cmd_output("uptime", root_symlink="uptime")
[general] collect 'hostname' as well as 'hostname -f'

The --fqdn option to hostname depends on the system resolver
configuration. On hosts where the fqdn is undefined the command
may return:

  "hostname: Name or service not known"

Since hostname will at least give the locally configured name
regardless of resolver or DNS state collect both commands.

Fixes #<I>.