diff --git a/keychain.1 b/keychain.1
index 711546e..414c08d 100644
--- a/keychain.1
+++ b/keychain.1
@@ -179,7 +179,7 @@ will look for privkey.ext.pub first, and if not found, will look for
 privkeyname.pub.
 .PP
 Keychain also supports gpg-agent in the same ways that ssh-agent is
-supported.  By default keychain attempts to start ssh-agent only. 
+supported.  By default keychain attempts to start ssh-agent only.
 You can modify this behavior using the \-\-agents
 option.
 .PP
@@ -190,7 +190,7 @@ It works with Bourne-compatible, csh-compatible and fish shells.
 .IP "\fB\-\-agents\fR \fIlist\fR" 4
 .IX Item "--agents list"
 Start the agents listed.  By default keychain will start ssh-agent
-if it is found in your path. The list should be comma-separated, 
+if it is found in your path. The list should be comma-separated,
 for example \*(L"gpg,ssh\*(R"
 .IP "\fB\-\-attempts\fR \fInum\fR" 4
 .IX Item "--attempts num"
@@ -292,7 +292,7 @@ List fingerprints of all active \s-1SSH\s0 keys, and exit, similar to \*(L"ssh-a
 .IP "\fB\-\-lockwait\fR \fIseconds\fR" 4
 .IX Item "--lockwait seconds"
 How long to wait for the lock to become available.  Defaults to 5
-seconds. Specify a value of zero or more. If the lock cannot be 
+seconds. Specify a value of zero or more. If the lock cannot be
 acquired within the specified number of seconds, then this keychain
 process will forcefully acquire the lock.
 .IP "\fB\-\-noask\fR" 4
@@ -310,7 +310,7 @@ Don't honor \s-1SSH_ASKPASS,\s0 if it is set.  This will cause ssh-add to
 prompt on the terminal instead of using a graphical program.
 .IP "\fB\-\-noinherit\fR" 4
 .IX Item "--noinherit"
-Don't inherit any agent processes, overriding the default 
+Don't inherit any agent processes, overriding the default
 \&\*(L"\-\-inherit local-once\*(R"
 .IP "\fB\-\-nolock\fR" 4
 .IX Item "--nolock"
@@ -375,11 +375,11 @@ key:
 \&    eval \`keychain \-\-eval id_rsa id_dsa 0123ABCD\`
 .Ve
 .PP
-For the fish shell, use the following format:
+For the fish shell, the following snippet can be added to your configuration file:
 .PP
 .Vb 3
 \&    if status \-\-is\-interactive
-\&        keychain \-\-eval \-\-quiet \-Q id_rsa | source
+\&        keychain \-\-eval \-\-quiet \-Q id_rsa id_dsa 0123ABCD | source
 \&    end
 .Ve
 .PP
@@ -415,6 +415,19 @@ This is equivalent for C shell (including tcsh):
 \&    endif
 .Ve
 .PP
+Likewise, the following commands can be used in fish:
+.PP
+.Vb 8
+\&    keychain id_rsa id_dsa 0123ABCD
+\&    test \-z "$hostname"; and set hostname (uname \-n)
+\&    if test \-f "$HOME/.keychain/$hostname\-fish"
+\&            source $HOME/.keychain/$hostname\-fish
+\&    end
+\&    if test \-f "$HOME/.keychain/$hostname\-fish\-gpg"
+\&            source $HOME/.keychain/$hostname\-fish\-gpg
+\&    end
+.Ve
+.PP
 To load keychain variables from a script (for example from cron) and
 abort unless id_dsa is available:
 .PP