diff --git a/builds/amd64/installer/new-hotness/Makefile b/builds/amd64/installer/new-hotness/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/amd64/installer/new-hotness/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/amd64/installer/new-hotness/PKG.yml b/builds/amd64/installer/new-hotness/PKG.yml
new file mode 100644
index 00000000..55693e33
--- /dev/null
+++ b/builds/amd64/installer/new-hotness/PKG.yml
@@ -0,0 +1,2 @@
+!include $ONL/builds/any/installer/new-hotness/APKG.yml ARCH=amd64
+
diff --git a/builds/amd64/installer/new-hotness/builds/.gitignore b/builds/amd64/installer/new-hotness/builds/.gitignore
new file mode 100644
index 00000000..fbd18542
--- /dev/null
+++ b/builds/amd64/installer/new-hotness/builds/.gitignore
@@ -0,0 +1 @@
+*INSTALLER
diff --git a/builds/amd64/installer/new-hotness/builds/Makefile b/builds/amd64/installer/new-hotness/builds/Makefile
new file mode 100644
index 00000000..3ec17a99
--- /dev/null
+++ b/builds/amd64/installer/new-hotness/builds/Makefile
@@ -0,0 +1,82 @@
+include $(ONL)/make/config.amd64.mk
+
+ONLPLATFORM = python $(ONL)/tools/onlplatform.py
+PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:amd64)
+
+MKSHAR = $(ONL)/tools/mkshar
+MKSHAR_OPTS = --lazy --unzip-pad --fixup-perms autoperms.sh
+MKSHAR_PERMS = autoperms.sh
+
+# Hardcoded to match ONL File naming conventions.
+include $(ONL)/make/version-onl.mk
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+
+
+__installer: __installer_platform_files __installer_swi_files
+	$(ONL_V_at)rm -rf *INSTALLER* *.md5sum
+	$(ONL_V_at)cp /dev/null installer.sh
+	$(ONL_V_at): ;\
+	set -e ;\
+	if $(ONL_V_P); then set -x; fi ;\
+	set dummy *.cpio.gz; initrd="$$2" ;\
+	sed \
+	  -e 's^@ONLVERSION@^$(VERSION_STRING)^g' \
+	  -e "s^@INITRD_ARCHIVE@^$$initrd^g" \
+	  -e 's^@INITRD_OFFSET@^^g' \
+	  -e 's^@INITRD_SIZE@^^g' \
+	  -e 's^@ARCH@^x86_64^g' \
+	  $(ONL)/builds/any/installer/new-hotness/installer.sh.in \
+	>> installer.sh
+	$(ONL_V_at)echo "PAYLOAD_FOLLOWS" >> installer.sh
+	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
+	$(ONL_V_at)cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
+	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
+	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
+	$(MKSHAR) $(MKSHAR_OPTS) "$(INSTALLER_NAME)" $(ONL)/tools/scripts/sfx.sh.in installer.sh kernel-* onl-loader-initrd-* *.swi version-onl.sh boot-config
+	$(ONL_V_at)rm -rf installer.sh kernel-* onl-loader-initrd-* $(ZTN_MANIFEST) *.swi version-onl.sh autoperms.sh
+	md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
+
+__installer_platform_files:
+	$(ONL_V_GEN): ;\
+	set -e ;\
+	if $(ONL_V_P); then set -x; fi ;\
+	l="$(PLATFORMS)"; for p in $$l; do \
+	  src=$$($(ONLPLATFORM) $$p amd64 kernel 2>/dev/null) || : ;\
+	  if test "$$src"; then \
+	    dst=$${src##*/} ;\
+	    if test "$dst" -ot Makefile; then \
+	      : ;\
+	    else \
+	      echo "Staging $$dst for $$p" ;\
+	      cp "$$src" "$$dst" ;\
+	    fi ;\
+	  fi ;\
+	  src=$$($(ONLPLATFORM) $$p amd64 initrd 2>/dev/null) || : ;\
+	  if test "$$src"; then \
+	    dst=$${src##*/} ;\
+	    if test "$dst" -ot Makefile; then \
+	      : ;\
+	    else \
+	      echo "Staging $$dst for $$p" ;\
+	      cp "$$src" "$$dst" ;\
+	    fi ;\
+	  fi ;\
+	done ;\
+	:
+
+__installer_swi_files:
+	$(ONL_V_GEN): ;\
+	set -e ;\
+	if $(ONL_V_P); then set -x; fi ;\
+	swidir=$$(mktemp -d $(PWD)/swi-d-XXXXXX) ;\
+	$(ONLPM) --extract-dir onl-swi:amd64 $$swidir ;\
+	mv $$swidir/usr/share/onl/packages/amd64/onl-swi/*.swi . ;\
+	rm -fr $$swidir ;\
+	:
+
+shar installer: installer
+
+clean:
+	rm -f *.swi *.installer $(notdir $(KERNELS)) *initrd*.cpio.gz
+
diff --git a/builds/amd64/installer/new-hotness/builds/boot-config b/builds/amd64/installer/new-hotness/builds/boot-config
new file mode 100644
index 00000000..40fb0d31
--- /dev/null
+++ b/builds/amd64/installer/new-hotness/builds/boot-config
@@ -0,0 +1,4 @@
+NETDEV=ma1
+NETAUTO=dhcp
+BOOTMODE=SWI
+SWI=images::latest