diff --git a/7.1/buster/apache/Dockerfile b/7.1/buster/apache/Dockerfile
index c3f549d4e8..5d7c6a98ec 100644
--- a/7.1/buster/apache/Dockerfile
+++ b/7.1/buster/apache/Dockerfile
@@ -254,6 +254,9 @@ RUN set -eux; \
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
diff --git a/7.1/buster/cli/Dockerfile b/7.1/buster/cli/Dockerfile
index c96f6183e8..b5c4ce6965 100644
--- a/7.1/buster/cli/Dockerfile
+++ b/7.1/buster/cli/Dockerfile
@@ -194,6 +194,9 @@ RUN set -eux; \
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/7.1/buster/fpm/Dockerfile b/7.1/buster/fpm/Dockerfile
index 1b63671f0b..5e9e1cdd8e 100644
--- a/7.1/buster/fpm/Dockerfile
+++ b/7.1/buster/fpm/Dockerfile
@@ -195,6 +195,9 @@ RUN set -eux; \
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
diff --git a/7.1/buster/zts/Dockerfile b/7.1/buster/zts/Dockerfile
index d8c13abc46..44fbc03a21 100644
--- a/7.1/buster/zts/Dockerfile
+++ b/7.1/buster/zts/Dockerfile
@@ -195,6 +195,9 @@ RUN set -eux; \
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/7.2/buster/apache/Dockerfile b/7.2/buster/apache/Dockerfile
index 4ad257aedd..5d8deef1f1 100644
--- a/7.2/buster/apache/Dockerfile
+++ b/7.2/buster/apache/Dockerfile
@@ -263,6 +263,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
diff --git a/7.2/buster/cli/Dockerfile b/7.2/buster/cli/Dockerfile
index c62d3e0348..0c065ea506 100644
--- a/7.2/buster/cli/Dockerfile
+++ b/7.2/buster/cli/Dockerfile
@@ -203,6 +203,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/7.2/buster/fpm/Dockerfile b/7.2/buster/fpm/Dockerfile
index b0f9e45080..1d0e50af0a 100644
--- a/7.2/buster/fpm/Dockerfile
+++ b/7.2/buster/fpm/Dockerfile
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
diff --git a/7.2/buster/zts/Dockerfile b/7.2/buster/zts/Dockerfile
index aab1327b25..63491af758 100644
--- a/7.2/buster/zts/Dockerfile
+++ b/7.2/buster/zts/Dockerfile
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile
index c988b03347..3daf88b3b3 100644
--- a/7.3/buster/apache/Dockerfile
+++ b/7.3/buster/apache/Dockerfile
@@ -263,6 +263,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile
index f5d346d46a..42214c94ee 100644
--- a/7.3/buster/cli/Dockerfile
+++ b/7.3/buster/cli/Dockerfile
@@ -203,6 +203,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile
index 7638cdb366..2c7a4458c1 100644
--- a/7.3/buster/fpm/Dockerfile
+++ b/7.3/buster/fpm/Dockerfile
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile
index 1893331739..bb48ff55f5 100644
--- a/7.3/buster/zts/Dockerfile
+++ b/7.3/buster/zts/Dockerfile
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index af1cf2bd2c..a615ac022e 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -213,6 +213,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
+RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
diff --git a/update.sh b/update.sh
index 8439b92261..5d68a0973e 100755
--- a/update.sh
+++ b/update.sh
@@ -194,6 +194,15 @@ for version in "${versions[@]}"; do
 					-e '/log_limit/d' \
 					"$version/$suite/$variant/Dockerfile"
 			fi
+			if [ "$suite" = 'stretch' ] || { [ "$majorVersion" = '7' ] && [ "$minorVersion" -ge '4' ]; }; then
+				# https://github.com/docker-library/php/issues/865
+				# https://bugs.php.net/bug.php?id=76324
+				# https://github.com/php/php-src/pull/3632
+				# https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3
+				sed -ri \
+					-e '/freetype-config/d' \
+					"$version/$suite/$variant/Dockerfile"
+			fi
 
 			# remove any _extra_ blank lines created by the deletions above
 			gawk '