diff --git a/Makefile b/Makefile
index 604395d3..3f3addb5 100644
--- a/Makefile
+++ b/Makefile
@@ -388,6 +388,7 @@ endef
 
 # Only some modules have binaries that we install
 # Shouldn't this be specified in the module file?
+bin_modules-$(CONFIG_QBOOT) += qboot
 bin_modules-$(CONFIG_KEXEC) += kexec
 bin_modules-$(CONFIG_TPMTOTP) += tpmtotp
 bin_modules-$(CONFIG_PCIUTILS) += pciutils
diff --git a/boards/qemu-tiny/qemu-tiny.config b/boards/qemu-tiny/qemu-tiny.config
index 0f8f5e4a..0ed7c08c 100644
--- a/boards/qemu-tiny/qemu-tiny.config
+++ b/boards/qemu-tiny/qemu-tiny.config
@@ -6,6 +6,8 @@ export CONFIG_COREBOOT=n
 #CONFIG_LINUXBOOT_BOARD=qemu
 CONFIG_LINUX_CONFIG=config/linux-tiny.config
 
+CONFIG_QBOOT=y
+
 ifeq "$(CONFIG_UROOT)" "y"
 CONFIG_BUSYBOX=n
 else
@@ -41,6 +43,7 @@ run:
 		--serial /dev/tty \
 		--device virtio-net,netdev=net0 \
 		--netdev user,id=net0,hostfwd=tcp::5555-:22 \
+		--bios $(build)/qboot-git/bios.bin \
 		--kernel $(build)/$(BOARD)/bzImage \
 		--initrd $(build)/$(BOARD)/initrd.cpio.xz
 	stty sane
diff --git a/modules/qboot b/modules/qboot
new file mode 100644
index 00000000..5e770296
--- /dev/null
+++ b/modules/qboot
@@ -0,0 +1,22 @@
+modules-$(CONFIG_QBOOT) += qboot
+
+qboot_depends := $(musl_dep)
+
+qboot_version := git
+qboot_repo := https://github.com/bonzini/qboot
+
+#qboot_version := 0.3.0
+qboot_dir := qboot-$(qboot_version)
+qboot_tar := qboot-$(qboot_version).tar.gz
+qboot_url := 
+qboot_hash := 
+
+# something is wrong with musl-gcc compiling qboot
+# use the system gcc, which isn't great
+qboot_target := \
+
+qboot_output := bios.bin
+
+qboot_libraries :=
+
+qboot_configure :=