diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest
index faf72290b8..69c495db48 100644
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -1,3 +1,4 @@
 DIST limine-2.84.2.tar.xz 1561312 BLAKE2B f46f0e37d581f7360377ad1582183bd89bc7eca57c7c11d388f02f6e8d1cf257f0150e15dc78390833974f7eb8bcaa8d3b49718fb9d49cb3edaf981f777f26cc SHA512 5fef4b7577078f2dd34d9a5bdaa4be1bebeb658c590d7cff4fa8aef73bbadab1a29983b949701a3103519c8a5f11b91ab1522b7b59315fc677b3a3b3d5e3eb91
 DIST limine-2.85.1.tar.xz 1562640 BLAKE2B 3f2070023d73c904db5fb7404168230be6a9f853facd4752eb5bfb00ac21d4bb32c1b05619ccc6049dd9348f4a652cf9967eb4e5ec52943fee5fbc587a21c62e SHA512 9b36d1c84331a3ed44222c1fd9bd6152d49ebe546b4fe7adce0cc21a4e56908639fc42a5040d530287452a88bb420ad8fa420c2af52de259598a868fdbdeb2ba
+DIST limine-2.85.4.tar.xz 1562124 BLAKE2B 611be229e0467838ccaba575d8afc06db1e6497173fbe48fdba2d5b6401163ee097fd61bab411b7e2ae4e1dd0476e4ee5b604f47bcefac9fbba1505464c32814 SHA512 a61da3ffc7e1aed1c080d534250424594b67acfcc1502694d6d1b73a5b18143985ed3f5ef23dffa904a6aba30d46e229dc590affd333511bc2a5c30b48f62b61
 DIST limine-2.85.tar.xz 1562456 BLAKE2B 00b0b5efd793f8ca32948529d2f06804fbae70604419c80b6a70f282b48a5a259ba9677ada81bca152fbcf86bdddac33fb63e4b8792d9cd5619649d9ff1523ee SHA512 84af1613aa335c34afcc118d0a5a4307c0a82352ea68036fbf2c5be52d156b6254688cf417f47c1685a5f84d596cb7ed8dbebc4243bdd6070039847a5dc69e02
diff --git a/sys-boot/limine/limine-2.85.4.ebuild b/sys-boot/limine/limine-2.85.4.ebuild
new file mode 100644
index 0000000000..1683e70d33
--- /dev/null
+++ b/sys-boot/limine/limine-2.85.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_LIBTOOL=none
+inherit autotools
+
+DESCRIPTION="Limine is a modern, advanced x86/x86_64 BIOS/UEFI multiprotocol bootloader."
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bios +bios-pxe +bios-cd +limine-install +uefi +eltorito-efi +uefi32 +uefi64"
+REQUIRED_USE="
+	uefi32? ( uefi )
+	uefi64? ( uefi )
+	eltorito-efi? ( uefi )
+	uefi? ( || ( uefi32 uefi64 eltorito-efi ) )
+
+	bios-pxe? ( bios )
+	bios-cd? ( bios )
+	limine-install? ( bios )
+	bios? ( || ( bios-pxe bios-cd limine-install ) )
+"
+
+BDEPEND="
+	sys-apps/findutils
+	dev-lang/nasm
+	app-arch/gzip
+	eltorito-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+		"$(use_enable limine-install)"
+
+		"$(use_enable uefi)"
+		"$(use_enable uefi32)"
+		"$(use_enable uefi64)"
+		"$(use_enable eltorito-efi)"
+	)
+
+	TOOLCHAIN="${CHOST}" \
+	econf "${myconf[@]}"
+}
diff --git a/sys-boot/limine/metadata.xml b/sys-boot/limine/metadata.xml
index bd468f6c49..2d767a9360 100644
--- a/sys-boot/limine/metadata.xml
+++ b/sys-boot/limine/metadata.xml
@@ -6,8 +6,30 @@
     <name>Arsen Arsenović</name>
   </maintainer>
   <use>
+    <flag name="uefi">
+      Enable UEFI support.
+    </flag>
+    <flag name="uefi32">
+      Enable 32-bit UEFI support.
+    </flag>
+    <flag name="uefi64">
+      Enable 64-bit UEFI support.
+    </flag>
     <flag name="eltorito-efi">
-        Enable building eltorito-efi.bin using <pkg>sys-fs/mtools</pkg>
+      Enable building eltorito-efi.bin using <pkg>sys-fs/mtools</pkg>.
+    </flag>
+
+    <flag name="bios">
+      Enable BIOS/MBR boot support.
+    </flag>
+    <flag name="bios-pxe">
+      Enables BIOS PXE boot support.
+    </flag>
+    <flag name="bios-cd">
+      Enables BIOS boot support for CDs.
+    </flag>
+    <flag name="limine-install">
+      Enables building the limine-install program.
     </flag>
   </use>
 </pkgmetadata>