diff --git a/Buildscr b/Buildscr
index 86532214..c9420658 100644
--- a/Buildscr
+++ b/Buildscr
@@ -151,11 +151,18 @@ in putty do perl -i~ -pe 'y/\015//d;s/$$/\015/' LICENCE
 delegate windows
   # FIXME: Cygwin alternative?
   in putty/windows do/win vcvars32 && nmake -f Makefile.vc $(Makeargs)
+  # Code-sign the binaries, if the local bob config provides a script
+  # to do so. We assume here that the script accepts an -i option to
+  # provide a 'more info' URL, and an optional -n option to provide a
+  # program name, and that it can take multiple .exe filename
+  # arguments and sign them all in place.
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ *.exe
   # Ignore exit code from hhc, in favour of seeing whether the .chm
   # file was created. (Yuck; but hhc appears to return non-zero
   # exit codes on whim.)
   in putty/doc do/win hhc putty.hhp & type putty.chm >nul
   in putty/windows do/win iscc putty.iss
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" Output/setup.exe
   return putty/windows/*.exe
   return putty/windows/*.map
   return putty/doc/putty.chm