diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74c43f2539..ae0a146c51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - Support for MemTest86 Free
 - Support for Tails
 - Support for Kali 32-bit net installer
+- Support for hrmpf
 - Adds additional options for arm64 iPXE binary downloads
 
 ## [2.0.47] - 2021-08-30
diff --git a/README.md b/README.md
index 5dfbde8684..81fe30100b 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | FreeDOS | http://www.freedos.org | ISO - Memdisk| No |
 | Gentoo | https://gentoo.org | Yes | Yes |
 | Harvester | https://harvesterhci.io | Yes | No |
+| hrmpf | https://github.com/leahneukirchen/hrmpf/ | No | Yes |
 | IPFire | https://www.ipfire.org | Yes | No |
 | Kali Linux | https://www.kali.org | Yes | Yes |
 | KDE Neon | https://neon.kde.org | No | Yes |
diff --git a/roles/netbootxyz/templates/menu/live-hrmpf.ipxe.j2 b/roles/netbootxyz/templates/menu/live-hrmpf.ipxe.j2
new file mode 100644
index 0000000000..e87524fba4
--- /dev/null
+++ b/roles/netbootxyz/templates/menu/live-hrmpf.ipxe.j2
@@ -0,0 +1,39 @@
+#!ipxe
+
+# hrmpf
+# https://github.com/leahneukirchen/hrmpf/
+
+goto ${menu} ||
+
+:live-hrmpf
+clear hrmpf_version
+set os hrmpf
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch amd64 ||
+menu ${os}
+item --gap ${os} Versions
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "hrmpf" %}
+item {{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
+choose hrmpf_version || goto hrmpf_exit
+goto ${hrmpf_version}
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "hrmpf" %}
+:{{ value.version }}
+set kernel_url ${live_endpoint}{{ value.path }}
+goto boot
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${kernel_url}vmlinuz root=live:${kernel_url}squashfs.img ro init=/sbin/init rd.luks=0 rd.md=0 rd.dm=0 gpt add_efi_memmap vconsole.unicode=1 vconsole.keymap=us locale.LANG=en_US.UTF-8 loglevel=6 printk.time=1 consoleblank=0 net.ifnames=0 {{ kernel_params }}
+initrd ${kernel_url}initrd
+boot
+
+:hrmpf_exit
+clear menu
+exit 0
diff --git a/roles/netbootxyz/templates/menu/live.ipxe.j2 b/roles/netbootxyz/templates/menu/live.ipxe.j2
index cc15784cee..5dff42e99c 100644
--- a/roles/netbootxyz/templates/menu/live.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/live.ipxe.j2
@@ -16,6 +16,7 @@ item live-endeavouros ${space} EndeavourOS
 item live-fatdog ${space} Fatdog64
 item live-fedora ${space} Fedora
 item live-feren ${space} Feren OS
+item live-hrmpf ${space} hrmpf
 item live-k3os ${space} K3OS
 item live-kali ${space} Kali
 item live-kodachi ${space} Kodachi