diff --git a/component/jpegoptim/buildout.cfg b/component/jpegoptim/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..414a71967e6b5f7c9b3222c0d2ca70cad3c55f34
--- /dev/null
+++ b/component/jpegoptim/buildout.cfg
@@ -0,0 +1,15 @@
+# Jpegoptim - utility to optimize jpeg files.
+# https://www.kokkonen.net/tjko/projects.html
+
+[buildout]
+extends =
+  ../libjpeg/buildout.cfg
+
+[jpegoptim]
+recipe = slapos.recipe.cmmi
+url = https://www.kokkonen.net/tjko/src/jpegoptim-1.4.6.tar.gz
+md5sum = 844c572d69fd5af75f0616b86e63962d
+configure-options =
+  --with-libjpeg=${libjpeg:location}
+environment =
+  LDFLAGS=-Wl,-rpath=${libjpeg:location}/lib
diff --git a/component/optipng/buildout.cfg b/component/optipng/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..88c1f728a35cb51710538e22cd9024e05abd8b68
--- /dev/null
+++ b/component/optipng/buildout.cfg
@@ -0,0 +1,18 @@
+# OptiPNG is a PNG optimizer that recompresses image files to a smaller size, without losing any information.
+# http://optipng.sourceforge.net/
+
+[buildout]
+extends =
+  ../libpng/buildout.cfg
+  ../zlib/buildout.cfg
+
+[optipng]
+recipe = slapos.recipe.cmmi
+url = http://prdownloads.sourceforge.net/optipng/optipng-0.7.7.tar.gz
+md5sum = 211101965baf42fd24a2aa990b7e842e
+configure-options =
+  --with-system-libpng
+  --with-system-zlib
+environment =
+  CPPFLAGS=-I${libpng:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 04b1689bced7ce8a6a261110fc4c3486bda834b1..96472d3b0fb499af7d77e4997550d098fcd29076 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -14,6 +14,7 @@ extends =
   ../../component/findutils/buildout.cfg
   ../../component/librsvg/buildout.cfg
   ../../component/imagemagick/buildout.cfg
+  ../../component/jpegoptim/buildout.cfg
   ../../component/kumo/buildout.cfg
   ../../component/libdmtx/buildout.cfg
   ../../component/matplotlib/buildout.cfg
@@ -21,6 +22,7 @@ extends =
   ../../component/statsmodels/buildout.cfg
   ../../component/h5py/buildout.cfg
   ../../component/ocropy/buildout.cfg
+  ../../component/optipng/buildout.cfg
   ../../component/pandas/buildout.cfg
   ../../component/percona-toolkit/buildout.cfg
   ../../component/patch/buildout.cfg
@@ -240,11 +242,13 @@ link-binary =
   ${grep:location}/bin/grep
   ${imagemagick:location}/bin/convert
   ${imagemagick:location}/bin/identify
+  ${jpegoptim:location}/bin/jpegoptim
   ${jsl:location}/bin/jsl
   ${librsvg:location}/bin/rsvg-convert
   ${mariadb:location}/bin/mysql
   ${mariadb:location}/bin/mysqldump
   ${openssl:location}/bin/openssl
+  ${optipng:location}/bin/optipng
   ${poppler:location}/bin/pdfinfo
   ${poppler:location}/bin/pdftohtml
   ${poppler:location}/bin/pdftotext