diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index 578f251d1c..96df9a0288 100644
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@@ -315,8 +315,14 @@ class Win32Freeze(Command, WixMixIn):
 
         self.info('\tAdding misc binary deps')
         bindir = os.path.join(SW, 'bin')
-        for x in ('pdftohtml', 'pdfinfo', 'pdftoppm'):
+        for x in ('pdftohtml', 'pdfinfo', 'pdftoppm', 'jpegtran-calibre', 'cjpeg-calibre'):
             shutil.copy2(os.path.join(bindir, x+'.exe'), self.base)
+        for x in ('', '.manifest'):
+            fname = 'optipng.exe' + x
+            src = os.path.join(bindir, fname)
+            shutil.copy2(src, self.base)
+            src = os.path.join(self.base, fname)
+            os.rename(src, src.replace('.exe', '-calibre.exe'))
         for pat in ('*.dll',):
             for f in glob.glob(os.path.join(bindir, pat)):
                 ok = True
diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst
index 9dd0d6b166..efa81d7a3e 100644
--- a/setup/installer/windows/notes.rst
+++ b/setup/installer/windows/notes.rst
@@ -545,6 +545,26 @@ libimobiledevice
 
 See libimobiledevice_notes.rst
 
+optipng
+----------
+
+Compiling instructions::
+
+    sed -i.bak 's/\$</%s/' src/libpng/scripts/makefile.vcwin32
+    nmake -f build/visualc.mk
+    cp src/optipng/optipng.exe* ~/sw/bin
+
+mozjpeg
+----------
+
+Compiling instructions::
+
+   mkdir -p build && cd build
+   cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DWITH_TURBOJPEG:BOOL=FALSE ..
+   nmake
+   cp jpegtran-static.exe ~/sw/bin/jpegtran-calibre.exe
+   cp cjpeg-static.exe ~/sw/bin/cjpeg-calibre.exe
+
 calibre
 ---------