diff --git a/Makefile b/Makefile
index 9ecd6da..536e235 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,19 @@ T_ARCHS=i686 x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl}
 T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl}
 T_CLOUD_IMGS=GCP{,-musl}
 
+T_PXE_ARCHS=x86_64{,-musl}
+
 ARCHS=$(shell echo $(T_ARCHS))
 PLATFORMS=$(shell echo $(T_PLATFORMS))
 SBC_IMGS=$(shell echo $(T_SBC_IMGS))
 CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))
+PXE_ARCHS=$(shell echo $(T_PXE_ARCHS))
 
 ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATE).tar.xz)
 ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATE).tar.xz)
 ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATE).img.xz)
 ALL_CLOUD_IMAGES=$(foreach cloud,$(CLOUD_IMGS),void-$(cloud)-$(DATE).tar.gz)
+ALL_PXE_ARCHS=$(foreach arch,$(PXE_ARCHS),void-$(arch)-NETBOOT-$(DATE).tar.gz)
 
 SUDO := sudo
 
@@ -75,6 +79,12 @@ void-GCP-$(DATE).tar.gz:
 void-GCP-musl-$(DATE).tar.gz:
 	$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz
 
+pxe-all: $(ALL_PXE_ARCHS)
 
+pxe-all-print:
+	@echo $(ALL_PXE_ARCHS)
 
-.PHONY: clean dist rootfs-all-print platformfs-all-print
+void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS)
+	$(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz
+
+.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print
diff --git a/dracut/netmenu/module-setup.sh b/dracut/netmenu/module-setup.sh
index 7e5fc42..5ba5318 100644
--- a/dracut/netmenu/module-setup.sh
+++ b/dracut/netmenu/module-setup.sh
@@ -7,7 +7,7 @@ check() {
 }
 
 depends() {
-    return 0
+    echo network
 }
 
 install() {
@@ -43,6 +43,7 @@ install() {
     inst /usr/bin/reboot
     inst /usr/bin/rm
     inst /usr/bin/sed
+    inst /usr/bin/sh
     inst /usr/bin/sort
     inst /usr/bin/sync
     inst /usr/bin/stdbuf
diff --git a/dracut/netmenu/netmenu.sh b/dracut/netmenu/netmenu.sh
index 448a5e2..3d42579 100755
--- a/dracut/netmenu/netmenu.sh
+++ b/dracut/netmenu/netmenu.sh
@@ -8,7 +8,7 @@ dialog --colors --keep-tite --no-shadow --no-mouse \
        "Shell" "Run dash" \
        2>/tmp/netmenu.action
 
-if ! $? ; then
+if [ ! $? ] ; then
     reboot -f
 fi
 
diff --git a/mknet.sh.in b/mknet.sh.in
index 752426a..76eb824 100644
--- a/mknet.sh.in
+++ b/mknet.sh.in
@@ -211,10 +211,10 @@ sed -i  -e "s|@@SPLASHIMAGE@@|$(basename "${SPLASH_IMAGE}")|" \
     "$PXELINUX_DIR/default"
 
 # Default output file format
-OUTPUT_FILE="void-netboot-${XBPS_TARGET_ARCH}-${KERNELVERSION}-$(date +%Y%m%d)"
-info_msg "Compressing results to $OUTPUT_FILE.tar.gz"
+OUTPUT_FILE="void-${XBPS_TARGET_ARCH}-NETBOOT-$(date +%Y%m%d).tar.gz"
+info_msg "Compressing results to $OUTPUT_FILE"
 cd "$BOOT_DIR" || die "Could not enter image dir"
-tar -zcvf "$CURDIR/$OUTPUT_FILE.tar.gz" .
+tar -zcvf "$CURDIR/$OUTPUT_FILE" .
 cd "$CURDIR" || die "Could not return to working directory"
 
 # As a final cleanup step, remove the ROOTFS and the expanded BOOT_DIR