diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
index 2bf84e901c..ad1fb13690 100644
--- a/11/alpine/Dockerfile
+++ b/11/alpine/Dockerfile
@@ -54,6 +54,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
+		llvm8-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
 		--with-libxml \
 		--with-libxslt \
 		--with-icu \
+		--with-llvm \
 	&& make -j "$(nproc)" world \
 	&& make install-world \
 	&& make -C contrib install \
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
index f61108292b..082735446d 100644
--- a/12/alpine/Dockerfile
+++ b/12/alpine/Dockerfile
@@ -54,6 +54,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
+		llvm8-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
 		--with-libxml \
 		--with-libxslt \
 		--with-icu \
+		--with-llvm \
 	&& make -j "$(nproc)" world \
 	&& make install-world \
 	&& make -C contrib install \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 217c60ffbc..877d8ee452 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -54,6 +54,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
+		llvm8-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
 		--with-libxml \
 		--with-libxslt \
 		--with-icu \
+		--with-llvm \
 	&& make -j "$(nproc)" world \
 	&& make install-world \
 	&& make -C contrib install \
diff --git a/update.sh b/update.sh
index 28aca4212e..528fbce56d 100755
--- a/update.sh
+++ b/update.sh
@@ -96,6 +96,10 @@ for version in "${versions[@]}"; do
 		if [ "$majorVersion" -gt 11 ]; then
 			sed -i '/backwards compat/d' "$version/$variant/Dockerfile"
 		fi
+		if [ "$majorVersion" -lt 11 ]; then
+			# JIT / LLVM is only supported in PostgreSQL 11+ (https://github.com/docker-library/postgres/issues/475)
+			sed -i '/llvm/d' "$version/$variant/Dockerfile"
+		fi
 
 		travisEnv="\n  - VERSION=$version VARIANT=$variant$travisEnv"
 	done