diff --git a/doc/man-pageant.but b/doc/man-pageant.but
index 5e31c8b9..358f3a08 100644
--- a/doc/man-pageant.but
+++ b/doc/man-pageant.but
@@ -294,6 +294,25 @@ with the \cw{--encrypted} option.)
 (This may leave some keys in cleartext, if they were not previously
 added with the \cw{--encrypted} option.)
 
+\dt \cw{--test-sign} \e{key-identifier}
+
+\dt \cw{--test-sign-with-flags=}\e{flags} \e{key-identifier}
+
+\dd Sign arbitrary data with the given key. This mode is only likely
+to be useful when testing \c{pageant} itself.
+
+\lcont{
+
+The data to sign is taken from standard input, signed by the agent
+with the key identified by \e{key-identifier}, and the resulting
+signature emitted on standard output (as a binary blob in the format
+defined by the SSH specifications).
+
+\e{flags} is a number representing a combination of flag bits defined
+by the SSH agent protocol.
+
+}
+
 \S{pageant-manpage-askpass} SSH-ASKPASS REPLACEMENT
 
 \dt \cw{--askpass} \e{prompt}
@@ -349,6 +368,19 @@ respectively. If neither option is given, Pageant will guess based on
 whether the environment variable \cw{SHELL} has a value ending in
 \cq{csh}.
 
+\dt \cw{--symlink} \e{fixed-path}
+
+\dd When operating in agent mode, as well as creating a uniquely named
+listening socket, \c{pageant} will also create (or update) a symbolic
+link at \e{fixed-path} pointing to that socket.
+
+\lcont{
+This allows access to an agent instance by setting the
+\c{SSH_AUTH_SOCK} environment variable to \e{fixed-path}, rather than
+having to use the value invented by \c{pageant} when it starts. It's
+mainly expected to be useful for debugging.
+}
+
 \dt \cw{--encrypted}, \cw{--no-decrypt}
 
 \dd When adding keys to the agent (at startup or later), keep them
diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c
index 4adca625..21087d63 100644
--- a/unix/uxpgnt.c
+++ b/unix/uxpgnt.c
@@ -211,6 +211,7 @@ static void usage(void)
     printf("Other options:\n");
     printf("  -v           verbose mode (in agent mode)\n");
     printf("  -s -c        force POSIX or C shell syntax (in agent mode)\n");
+    printf("  --symlink path   create symlink to socket (in agent mode)\n");
     printf("  --encrypted  when adding keys, don't decrypt\n");
     printf("  -E alg, --fptype alg   fingerprint type for -l (sha256, md5)\n");
     printf("  --tty-prompt force tty-based passphrase prompt\n");