diff --git a/doc/index.but b/doc/index.but
index afd74167..4c76bb05 100644
--- a/doc/index.but
+++ b/doc/index.but
@@ -867,6 +867,11 @@ saved sessions from
 \IM{authentication agent} agent, authentication
 
 \IM{-c-pageant} \c{-c} Pageant command-line option
+\IM{--keylist} \c{--keylist} Pageant command-line option
+\IM{--openssh-config} \c{--openssh-config} Pageant command-line option
+
+\IM{Windows OpenSSH} Windows OpenSSH
+\IM{Windows OpenSSH} OpenSSH, on Windows
 
 \IM{FAQ} FAQ
 \IM{FAQ} Frequently Asked Questions
diff --git a/doc/pageant.but b/doc/pageant.but
index 8c19633d..c94b88d6 100644
--- a/doc/pageant.but
+++ b/doc/pageant.but
@@ -170,7 +170,7 @@ by the command, like this:
 
 \c C:\PuTTY\pageant.exe d:\main.ppk -c C:\PuTTY\putty.exe
 
-\S{pageant-cmdline-openssh} Integrating with Windows OpenSSH
+\S{pageant-cmdline-openssh} Integrating with \i{Windows OpenSSH}
 
 Windows's own port of OpenSSH uses the same mechanism as Pageant to
 talk to its SSH agent (Windows named pipes). This means that Windows
@@ -184,7 +184,7 @@ configuration, then \c{ssh.exe} should automatically use Pageant as
 its agent, so that you can keep your keys in one place and have both
 SSH clients able to use them.
 
-The option is \c{--openssh-config}, and you follow it with a filename.
+The option is \i\c{--openssh-config}, and you follow it with a filename.
 
 To refer to this file from your main OpenSSH configuration, you can
 use the \cq{Include} directive. For example, you might run Pageant
diff --git a/doc/pubkey.but b/doc/pubkey.but
index 57282455..80382076 100644
--- a/doc/pubkey.but
+++ b/doc/pubkey.but
@@ -549,6 +549,11 @@ key.
 
 }
 
+\dt \cw{\-E} \e{fptype}
+
+\dd Algorithm to use when displaying key fingerprints. You can
+select \c{sha256} or \c{md5}. See \k{puttygen-fingerprint}.
+
 \H{pubkey-gettingready} Getting ready for public key authentication
 
 Connect to your SSH server using PuTTY with the SSH protocol. When the
diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
index 248ccf27..480c2162 100644
--- a/unix/CMakeLists.txt
+++ b/unix/CMakeLists.txt
@@ -19,14 +19,16 @@ add_sources_from_current_dir(utils
   utils/pollwrap.c
   utils/signal.c
   utils/x11_ignore_error.c
-  # Compiled icon pixmap files
-  putty-xpm.c
-  putty-config-xpm.c
-  pterm-xpm.c
-  pterm-config-xpm.c
   # We want the ISO C implementation of ltime(), because we don't have
   # a local better alternative
   ../utils/ltime.c)
+# Compiled icon pixmap files
+add_library(puttyxpms STATIC
+  putty-xpm.c
+  putty-config-xpm.c)
+add_library(ptermxpms STATIC
+  pterm-xpm.c
+  pterm-config-xpm.c)
 add_sources_from_current_dir(eventloop
   cliloop.c uxsel.c)
 add_sources_from_current_dir(console
@@ -139,7 +141,7 @@ if(GTK_FOUND)
     pty.c)
   be_list(pterm pterm)
   target_link_libraries(pterm
-    guiterminal eventloop settings charset utils
+    guiterminal eventloop settings charset utils ptermxpms
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
   installed_program(pterm)
 
@@ -154,7 +156,7 @@ if(GTK_FOUND)
       pty.c)
     be_list(ptermapp pterm)
     target_link_libraries(ptermapp
-      guiterminal eventloop settings charset utils
+      guiterminal eventloop settings charset utils ptermxpms
       ${GTK_LIBRARIES} ${X11_LIBRARIES})
   endif()
 
@@ -164,7 +166,7 @@ if(GTK_FOUND)
   be_list(putty PuTTY SSH SERIAL OTHERBACKENDS)
   target_link_libraries(putty
     guiterminal eventloop sshclient otherbackends settings
-    network crypto charset utils
+    network crypto charset utils puttyxpms
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
   set_target_properties(putty
     PROPERTIES LINK_INTERFACE_MULTIPLICITY 2)
@@ -178,7 +180,7 @@ if(GTK_FOUND)
     be_list(puttyapp PuTTY SSH SERIAL OTHERBACKENDS)
     target_link_libraries(puttyapp
       guiterminal eventloop sshclient otherbackends settings
-      network crypto charset utils
+      network crypto charset utils puttyxpms
       ${GTK_LIBRARIES} ${X11_LIBRARIES})
   endif()
 
@@ -193,6 +195,7 @@ if(GTK_FOUND)
   be_list(puttytel PuTTYtel SERIAL OTHERBACKENDS)
   target_link_libraries(puttytel
     guiterminal eventloop otherbackends settings network charset utils
+    puttyxpms
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
 endif()