diff --git a/Buildscr b/Buildscr
index a009d60..a1cfb7e 100644
--- a/Buildscr
+++ b/Buildscr
@@ -61,8 +61,15 @@ delegate windows
   # FIXME: Cygwin alternative?
   in puzzles do/win vcvars32 && nmake -f Makefile.vc clean
   in puzzles do/win vcvars32 && nmake -f Makefile.vc VER=-DVER=$(Version)
+  # 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 puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
   # Build installer.
   in puzzles do/win iscc puzzles.iss
+  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" Output/setup.exe
   return puzzles/puzzles.chm
   return puzzles/*.exe
   return puzzles/Output/setup.exe