diff --git a/openjdk15-boot/Pkgfile b/openjdk15-boot/Pkgfile
index c351283..003c671 100644
--- a/openjdk15-boot/Pkgfile
+++ b/openjdk15-boot/Pkgfile
@@ -1,10 +1,10 @@
-# Description: OpenJDK 14 (minimal pkg for bootstrapping)
+# Description: OpenJDK 15 (minimal pkg for bootstrapping)
 # URL: https://openjdk.java.net/
 # Maintainer:
-# Depends on: alsa-lib cups fontconfig freetype giflib krb5 lcms2 libffi libjpeg-turbo libpng libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip
+# Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip
 
 name=openjdk15-boot
-version=15.0.2+7
+version=15.0.3+1
 _boot_ver=20210207
 _cert_ver=20200215
 release=1
@@ -13,10 +13,6 @@ source=(https://crux.ster.zone/downloads/java/openjdk-$version.tar.bz2
   https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver})
 
 build() {
-  # Make sure we do not have ccache masquerade directory in PATH.
-  # Use --enable-ccache instead of providing a wrapped compiler.
-  # NOTE: the check for usr/bin/ccache may be too specific, since it rules out
-  #       local or opt installs.
   if [ -e '/usr/bin/ccache' ]; then
     PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
     PKGMK_JDK15+=' --enable-ccache'
@@ -30,17 +26,12 @@ build() {
   unset CXXFLAGS
   unset LDFLAGS
   unset MAKEFLAGS
+  export _CFLAGS+=' -fcommon'
+  export _CXXFLAGS+=' -fcommon'
 
   [ -z $JOBS ] && JOBS=$(nproc)
 
-  mkdir $SRC/{build-boot,build}
-  cd $SRC/build-boot
-
-  export _CFLAGS+=' -fcommon'
-  export _CXXFLAGS+=' -fcommon'
-  LC_ALL=C
-  /bin/bash ../jdk15u-jdk-$version/configure $PKGMK_JDK15 \
-    --prefix=$SRC/build-boot/images/jdk \
+  local _COMMON_OPTIONS="
     --disable-precompiled-headers \
     --disable-warnings-as-errors \
     --enable-dtrace=no \
@@ -53,15 +44,23 @@ build() {
     --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
     --with-jtreg=no \
     --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
+    --with-version-opt=CRUX-r$release
+    --with-version-build=${version#*+}
+    --with-vendor-name=CRUX
+    --with-jobs=$JOBS
+    --with-libjpeg=system
+    --with-giflib=system
+    --with-libpng=system
+    --with-zlib=system
+    --with-lcms=system"
+
+  mkdir $SRC/{build-boot,build}
+  cd $SRC/build-boot
+
+  LC_ALL=C \
+  /bin/bash ../jdk15u-jdk-$version/configure $PKGMK_JDK15 \
+    $_COMMON_OPTIONS \
+    --prefix=$SRC/build-boot/images/jdk \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"
 
@@ -76,28 +75,8 @@ build() {
 
   LC_ALL=C
   /bin/bash ../jdk15u-jdk-$version/configure $PKGMK_JDK13 \
+    $_COMMON_OPTIONS \
     --prefix=/$name \
-    --disable-precompiled-headers \
-    --disable-warnings-as-errors \
-    --enable-dtrace=no \
-    --enable-headless-only \
-    --enable-unlimited-crypto \
-    --with-native-debug-symbols=none \
-    --with-debug-level=release \
-    --with-stdc++lib=dynamic \
-    --with-jvm-variants=server \
-    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
-    --with-jtreg=no \
-    --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"