diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest
index 814e4b8044..1825a83b43 100644
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -2,3 +2,4 @@ DIST limine-2.85.1.tar.xz 1562640 BLAKE2B 3f2070023d73c904db5fb7404168230be6a9f8
 DIST limine-2.85.4.tar.xz 1562124 BLAKE2B 611be229e0467838ccaba575d8afc06db1e6497173fbe48fdba2d5b6401163ee097fd61bab411b7e2ae4e1dd0476e4ee5b604f47bcefac9fbba1505464c32814 SHA512 a61da3ffc7e1aed1c080d534250424594b67acfcc1502694d6d1b73a5b18143985ed3f5ef23dffa904a6aba30d46e229dc590affd333511bc2a5c30b48f62b61
 DIST limine-2.85.tar.xz 1562456 BLAKE2B 00b0b5efd793f8ca32948529d2f06804fbae70604419c80b6a70f282b48a5a259ba9677ada81bca152fbcf86bdddac33fb63e4b8792d9cd5619649d9ff1523ee SHA512 84af1613aa335c34afcc118d0a5a4307c0a82352ea68036fbf2c5be52d156b6254688cf417f47c1685a5f84d596cb7ed8dbebc4243bdd6070039847a5dc69e02
 DIST limine-2.88.tar.xz 3154252 BLAKE2B d3e7b081245010c7fe5218ea364a4bb825ef6b7505b33db37bdc6a0e61a43f273c443d00df6ae7b61901420704d0368b5bcad59797f3eeb403c3bb9388193927 SHA512 53bb81e1261a5a6ae45c525cb2724871a11544c2d8236d421e6cde42c34cbf4c6b4a1a322a86e8064abadf5c124525149cecd93339a748a925673fc581805cee
+DIST limine-3.0.tar.xz 3164168 BLAKE2B fedd161ec8957fd2b3245d8a7a6bffaeab4fa7629b5c07671287f964b8dd78396b530299a0b3f9de0c4ea0010624590ec505308b0612cfd419cbb4bc57b21496 SHA512 c92c5a6f094f7dd90bebbbaf5be59843897a66771550805e70536793549e42bdc49f4763a0eda9491235ace801ca3644697276de381240654b9cc95ea5c2e353
diff --git a/sys-boot/limine/limine-3.0.ebuild b/sys-boot/limine/limine-3.0.ebuild
new file mode 100644
index 0000000000..d054a12ede
--- /dev/null
+++ b/sys-boot/limine/limine-3.0.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-deploy +uefi +cd-efi +uefi32 +uefi64"
+REQUIRED_USE="
+	uefi32? ( uefi )
+	uefi64? ( uefi )
+	cd-efi? ( uefi )
+	uefi? ( || ( uefi32 uefi64 cd-efi ) )
+
+	bios-pxe? ( bios )
+	bios-cd? ( bios )
+	limine-deploy? ( bios )
+	bios? ( || ( bios-pxe bios-cd limine-deploy ) )
+"
+
+BDEPEND="
+	sys-apps/findutils
+	dev-lang/nasm
+	app-arch/gzip
+	cd-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+		"$(use_enable limine-deploy)"
+
+		"$(use_enable uefi)"
+		"$(use_enable uefi32)"
+		"$(use_enable uefi64)"
+		"$(use_enable cd-efi)"
+	)
+
+	TOOLCHAIN="${CHOST}" \
+	econf "${myconf[@]}"
+}
diff --git a/sys-boot/limine/metadata.xml b/sys-boot/limine/metadata.xml
index 2d767a9360..76cd6a3b4d 100644
--- a/sys-boot/limine/metadata.xml
+++ b/sys-boot/limine/metadata.xml
@@ -18,6 +18,10 @@
     <flag name="eltorito-efi">
       Enable building eltorito-efi.bin using <pkg>sys-fs/mtools</pkg>.
     </flag>
+    <flag name="cd-efi">
+        Enable building cd-efi.bin using <pkg>sys-fs/mtools</pkg>.
+        This flag was previously known as eltorito-efi.
+    </flag>
 
     <flag name="bios">
       Enable BIOS/MBR boot support.
@@ -31,5 +35,9 @@
     <flag name="limine-install">
       Enables building the limine-install program.
     </flag>
+    <flag name="limine-deploy">
+      Enables building the limine-deploy program.
+      This flag was previously known as limine-deploy.
+    </flag>
   </use>
 </pkgmetadata>