diff --git a/extra/bootstrap/apacman-2.3-1-any.FIXED.pkg.tar.xz b/extra/bootstrap/apacman-2.3-1-any.FIXED.pkg.tar.xz
new file mode 100644
index 0000000..4705468
Binary files /dev/null and b/extra/bootstrap/apacman-2.3-1-any.FIXED.pkg.tar.xz differ
diff --git a/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz b/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz
deleted file mode 100644
index 1a2918e..0000000
Binary files a/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz and /dev/null differ
diff --git a/extra/packages.both b/extra/packages.both
index cb91296..df52b94 100644
--- a/extra/packages.both
+++ b/extra/packages.both
@@ -141,11 +141,11 @@ keyutils
 kismet-allplugins
 lftp
 links
-logkeys-git
+#logkeys-git # requires a /dev/input, which apparently isn't included in the chroots
 lm_sensors
 lrzsz
 lshw
-lsiutil
+#lsiutil # 404'ing on source url at the moment
 lsof
 lsscsi
 lxde
diff --git a/extra/pre-build.d/etc/customizepkg.d/etc-update b/extra/pre-build.d/etc/customizepkg.d/etc-update
new file mode 100755
index 0000000..a762691
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/etc-update
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}
diff --git a/extra/pre-build.d/etc/customizepkg.d/fang b/extra/pre-build.d/etc/customizepkg.d/fang
new file mode 100755
index 0000000..a762691
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/fang
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}
diff --git a/extra/pre-build.d/etc/customizepkg.d/libnfc b/extra/pre-build.d/etc/customizepkg.d/libnfc
new file mode 100755
index 0000000..a762691
--- /dev/null
+++ b/extra/pre-build.d/etc/customizepkg.d/libnfc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}
diff --git a/src/ipxe b/src/ipxe
index 6143057..99b5216 160000
--- a/src/ipxe
+++ b/src/ipxe
@@ -1 +1 @@
-Subproject commit 614305743031bdfc02cb4ce346e450cd1d476e17
+Subproject commit 99b5216b1c71dba22dab734e0945887525493cde
diff --git a/src/ipxe_local/patches/ipxe-0002-banner.patch b/src/ipxe_local/patches/ipxe-0002-banner.patch
index d54b959..1107f90 100644
--- a/src/ipxe_local/patches/ipxe-0002-banner.patch
+++ b/src/ipxe_local/patches/ipxe-0002-banner.patch
@@ -1,23 +1,35 @@
---- a/src/usr/autoboot.c
-+++ b/src/usr/autoboot.c
+--- a/usr/autoboot.c
++++ b/usr/autoboot.c
 @@ -71,6 +71,7 @@
- #define NORMAL	"\033[0m"
- #define BOLD	"\033[1m"
- #define CYAN	"\033[36m"
-+#define BLUE	"\033[34m"
+ #define NORMAL "\033[0m"
+ #define BOLD   "\033[1m"
+ #define CYAN   "\033[36m"
++#define BLUE   "\033[34m"
  
  /** The "scriptlet" setting */
  const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = {
-@@ -538,11 +539,10 @@
- 	 * do so.
- 	 *
- 	 */
--	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
-+	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
- 		 NORMAL " -- " PRODUCT_TAG_LINE " -- "
--		 CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
-+		 CYAN PRODUCT_URI NORMAL "\n"
-+		 BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" );
- 	printf ( "\n" );
+@@ -521,7 +522,6 @@
+  * @ret rc             Return status code
+  */
+ int ipxe ( struct net_device *netdev ) {
+-       struct feature *feature;
+        struct image *image;
+        char *scriptlet;
+        int rc;
+@@ -538,11 +538,11 @@
+         * do so.
+         *
+         */
+-       printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
++       printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
+                 NORMAL " -- " PRODUCT_TAG_LINE " -- "
+-                CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
+-       for_each_table_entry ( feature, FEATURES )
+-               printf ( " %s", feature->name );
++                CYAN PRODUCT_URI NORMAL "\n"
++                BOLD "BDisk" BLUE "LiveDistro" NORMAL " -- Welp, Yer Boned!(TM) -- "
++                BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" );
+        printf ( "\n" );
  
- 	/* Boot system */
+        /* Boot system */
+