diff --git a/doc_src/fishd.txt b/doc_src/fishd.txt
index a2bb494bb..074e8f5d8 100644
--- a/doc_src/fishd.txt
+++ b/doc_src/fishd.txt
@@ -17,12 +17,12 @@ When no clients are connected, fishd will automatically shut down.
 
 \subsection fishd-files Files
 
-\c ~/.config/fish/fishd.HOSTNAME permanent storage location for universal
-variable data. The data is stored as a set of \c set and \c set_export
-commands such as would be parsed by fishd. The file must always be
-stored in ASCII format. If an instance of fishd is running (which is
-generally the case), manual modifications to ~/.fishd.HOSTNAME will be
-lost. Do NOT edit this file manually!
+\c ~/.config/fish/fishd.MACHINE_ID permanent storage location for universal
+variable data. MACHINE_ID is generally based on the machine's MAC address.
+The data is stored as a set of \c set and \c set_export commands such as
+would be parsed by fishd. The file must always be stored in ASCII format.
+If an instance of fishd is running (which is generally the case), manual
+modifications to ~/.fishd.MACHINE_ID will be lost. Do NOT edit this file manually!
 
 \c /tmp/fishd.socket.USERNAME the socket which fishd uses to communicate
 with all clients.
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 1df30947b..946bb73d1 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1250,8 +1250,8 @@ shell:
 end</pre>
 
 <a href="#variables-universal">Universal variables</a> are stored in
-the file .config/fish/fishd.HOSTNAME, where HOSTNAME is the name of your
-computer. Do not edit this file directly, edit them through fish
+the file .config/fish/fishd.MACHINE_ID, where MACHINE_ID is typically your
+MAC address. Do not edit this file directly, edit them through fish
 scripts or by using fish interactively instead.
 
 \section other Other features