diff --git a/pkg.info b/pkg.info
index e77ec90..9807b6b 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: openjdk-21
 description: OpenJDK Java 21
 version: 21.0.9+4
-revision: 2
+revision: 3
 url: https://openjdk.org/
 license: GPL2-only WITH Classpath-exception-2.0
 architecture: any
diff --git a/source.sh b/source.sh
index 4cbea56..0431483 100644
--- a/source.sh
+++ b/source.sh
@@ -16,7 +16,9 @@ prepare() {
 # This function is used to compile the source code
 build() {
   unset MAKEFLAGS
-  
+
+  [ -z "$BOOT_JDK" ] && export BOOT_JDK=/usr/lib/java/openjdk-21/
+
   bash configure --enable-unlimited-crypto                       \
                  --disable-warnings-as-errors                    \
                  --with-stdc++lib=dynamic                        \
@@ -29,25 +31,26 @@ build() {
                  --with-version-build=${BPM_PKG_VERSION##*+}     \
                  --with-version-pre=""                           \
                  --with-version-opt=""                           \
-                 --with-cacerts-file=/etc/pki/tls/java/cacerts
+                 --with-cacerts-file=/etc/pki/tls/java/cacerts   \
+                 --with-boot-jdk="$BOOT_JDK"
   make images
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  install -d "$BPM_OUTPUT"/usr/lib/java/openjdk-"${BPM_PKG_VERSION%%.*}"
-  cp -r build/*/images/jdk/* "$BPM_OUTPUT"/usr/lib/java/openjdk-"${BPM_PKG_VERSION%%.*}"/
-  chown -R root:root "$BPM_OUTPUT"/usr/lib/java/openjdk-"${BPM_PKG_VERSION%%.*}"
+  install -d "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}
+  cp -r build/*/images/jdk/* "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}/
+  chown -R root:root "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}
 
   # Symlink cacerts
-  ln -sf /etc/pki/tls/java/cacerts "$BPM_OUTPUT"/usr/lib/java/openjdk-"${BPM_PKG_VERSION%%.*}"/lib/security/cacerts
+  ln -sf /etc/pki/tls/java/cacerts "$BPM_OUTPUT"/usr/lib/java/openjdk-${BPM_PKG_VERSION%%.*}/lib/security/cacerts
 
   # Install icons
   for size in 16 24 32 48; do
     install -Dm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${size}.png "$BPM_OUTPUT"/usr/share/icons/hicolor/${size}x${size}/apps/java.png
   done
   
-  install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/openjdk-21/LICENSE
-  install -Dm644 "$BPM_SOURCE"/ASSEMBLY_EXCEPTION "$BPM_OUTPUT"/usr/share/licenses/openjdk-21/ASSEMBLY_EXCEPTION
+  install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/openjdk-${BPM_PKG_VERSION%%.*}/LICENSE
+  install -Dm644 "$BPM_SOURCE"/ASSEMBLY_EXCEPTION "$BPM_OUTPUT"/usr/share/licenses/openjdk-${BPM_PKG_VERSION%%.*}/ASSEMBLY_EXCEPTION
 }