diff --git a/openjdk8-boot/Pkgfile b/openjdk8-boot/Pkgfile
index 0ee9f03..db3a6d3 100644
--- a/openjdk8-boot/Pkgfile
+++ b/openjdk8-boot/Pkgfile
@@ -50,47 +50,50 @@ build() {
     JAVA_CACERTS=$SRC/certs/etc/pki/tls/java/cacerts
   fi
 
+  local _COMMON_OPTIONS="
+    --disable-bootstrap
+    --disable-docs
+    --disable-downloading
+    --disable-precompiled-headers
+    --disable-tests
+    --disable-hotspot-tests
+    --disable-langtools-tests
+    --disable-jdk-tests
+    --disable-systemtap-tests
+    --disable-system-pcsc
+    --disable-system-sctp
+    --enable-system-cups
+    --enable-system-fontconfig
+    --enable-system-gio
+    --enable-system-gtk
+    --enable-system-jpeg
+    --enable-system-kerberos
+    --enable-system-lcms
+    --enable-system-png
+    --enable-system-zlib
+    --enable-non-nss-curves
+    --enable-nss
+    --with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz
+    --with-hotspot-src-zip=$SRC/hotspot-$version.tar.xz
+    --with-corba-src-zip=$SRC/corba-$version.tar.xz
+    --with-jaxp-src-zip=$SRC/jaxp-$version.tar.xz
+    --with-jaxws-src-zip=$SRC/jaxws-$version.tar.xz
+    --with-jdk-src-zip=$SRC/jdk-$version.tar.xz
+    --with-langtools-src-zip=$SRC/langtools-$version.tar.xz
+    --with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz
+    --with-pkgversion=CRUX
+    --with-jdk-home=$JAVA_HOME
+    --with-cacerts-file=$JAVA_CACERTS
+    --with-tzdata-dir=/usr/share/zoneinfo"
+
   mkdir $SRC/build-boot
   cd $SRC/build-boot
 
   LC_ALL=C \
   CONFIG_SHELL=/bin/bash \
   ../icedtea-$_icedtea_version/configure \
+    $_COMMON_OPTIONS \
     --prefix=$SRC/build-boot/openjdk.build/images/j2sdk-image \
-    --disable-bootstrap \
-    --disable-docs \
-    --disable-downloading \
-    --disable-precompiled-headers \
-    --disable-tests \
-    --disable-hotspot-tests \
-    --disable-langtools-tests \
-    --disable-jdk-tests \
-    --disable-systemtap-tests \
-    --disable-system-pcsc \
-    --disable-system-sctp \
-    --enable-system-cups \
-    --enable-system-fontconfig \
-    --enable-system-gio \
-    --enable-system-gtk \
-    --enable-system-jpeg \
-    --enable-system-kerberos \
-    --enable-system-lcms \
-    --enable-system-png \
-    --enable-system-zlib \
-    --enable-non-nss-curves \
-    --enable-nss \
-    --with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz \
-    --with-hotspot-src-zip=$SRC/hotspot-$version.tar.xz \
-    --with-corba-src-zip=$SRC/corba-$version.tar.xz \
-    --with-jaxp-src-zip=$SRC/jaxp-$version.tar.xz \
-    --with-jaxws-src-zip=$SRC/jaxws-$version.tar.xz \
-    --with-jdk-src-zip=$SRC/jdk-$version.tar.xz \
-    --with-langtools-src-zip=$SRC/langtools-$version.tar.xz \
-    --with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz \
-    --with-pkgversion=CRUX \
-    --with-jdk-home=$JAVA_HOME \
-    --with-cacerts-file=$JAVA_CACERTS \
-    --with-tzdata-dir=/usr/share/zoneifno
 
   LC_ALL=C \
   make
@@ -106,41 +109,8 @@ build() {
   LC_ALL=C \
   CONFIG_SHELL=/bin/bash \
   ../icedtea-$_icedtea_version/configure \
-    --prefix=/$name \
-    --disable-bootstrap \
-    --disable-docs \
-    --disable-downloading \
-    --disable-precompiled-headers \
-    --disable-tests \
-    --disable-hotspot-tests \
-    --disable-langtools-tests \
-    --disable-jdk-tests \
-    --disable-systemtap-tests \
-    --disable-system-pcsc \
-    --disable-system-sctp \
-    --enable-system-cups \
-    --enable-system-fontconfig \
-    --enable-system-gio \
-    --enable-system-gtk \
-    --enable-system-jpeg \
-    --enable-system-kerberos \
-    --enable-system-lcms \
-    --enable-system-png \
-    --enable-system-zlib \
-    --enable-non-nss-curves \
-    --enable-nss \
-    --with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz \
-    --with-hotspot-src-zip=$SRC/hotspot-$version.tar.xz \
-    --with-corba-src-zip=$SRC/corba-$version.tar.xz \
-    --with-jaxp-src-zip=$SRC/jaxp-$version.tar.xz \
-    --with-jaxws-src-zip=$SRC/jaxws-$version.tar.xz \
-    --with-jdk-src-zip=$SRC/jdk-$version.tar.xz \
-    --with-langtools-src-zip=$SRC/langtools-$version.tar.xz \
-    --with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz \
-    --with-pkgversion=CRUX \
-    --with-jdk-home=$JAVA_HOME \
-    --with-cacerts-file=$JAVA_CACERTS \
-    --with-tzdata-dir=/usr/share/zoneifno
+    $_COMMON_OPTIONS \
+    --prefix=/$name
 
   LC_ALL=C \
   make
@@ -153,6 +123,7 @@ build() {
   rm -f $PKG/$name/src.zip
   rm -rf $PKG/$name/{demo,man,sample,jre/lib/images}
   rm -f $PKG/$name/{,jre/}THIRD_PARTY_README
+
   find $PKG/$name \( \
     -name '*.ja' -o \
     -name '*.txt' -o \