diff --git a/licenses/hug-ware b/licenses/hug-ware
index 01f107c89..3683406a3 100644
--- a/licenses/hug-ware
+++ b/licenses/hug-ware
@@ -1,4 +1,4 @@
-"THE HUG-WARE LICENSE" (Revision 1):
-xo <xo@rotce.de> and tastytea <tastytea@tastytea.de> wrote these files. As long
-as you retain this notice you can do whatever you want with this stuff. If we
-meet some day, and you think this stuff is worth it, you can give us a hug.
+"THE HUG-WARE LICENSE" (Revision 2):
+teldra <teldra@rotce.de> and tastytea <tastytea@tastytea.de> wrote this.
+As long as you retain this notice you can do whatever you want with this.
+If we meet some day, and you think this is nice, you can give us a hug.
diff --git a/sys-apps/hashboot/Manifest b/sys-apps/hashboot/Manifest
index 0a023048e..035b31c4c 100644
--- a/sys-apps/hashboot/Manifest
+++ b/sys-apps/hashboot/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD hashboot-9999.ebuild 840 BLAKE2B dbb402ae5b0854e367721938548a1bfb0fda3b0e3f939ca5a828a4dd17692e23792cfa3ef65e7b9b61d26549a4b7a38bda574e0725ae32ad9883f4469635185a SHA512 b2ddf81fb80521004521b0f7cca2f88d3d384c09c62ddb963a81ef7c92b4e1d968b3940fb40309a10b9053c6b45f3ff4d4a285f11fdf8e11574d143c1b936617
-MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
+EBUILD hashboot-9999.ebuild 693 BLAKE2B ab5fbe6fd454fa345719c95d926b63122bd6fd138fab97907bc82f1aa0dbae39ee79ae0e0da03fad75116030fa03d658874069314f6c7f0e7c9d3b4bed4f3e07 SHA512 8fb5cfdab406b43fe6d63c450dc3ad1096f50948705e6fde797e51170f182cc0b34ecf3898d354d309ddca66bd9238abf75c84240384782713073d1a66d3beb2
+MISC metadata.xml 564 BLAKE2B eb11f8ef0db175268688e1a31e741285d369d75e5cb7f25ce5810e9310851f42ab56dc34edf1b3b2e7726fb36f673726b554a44a112bdb33c2db8264e42e5027 SHA512 a4c10a48c0eb6258dd3e3b63c7012cf3231328029beaf1b25a9ed92b8726efabd982a7672662fc059862393c81b8435b20057d9b613fc15a0abc6802722ae7f0
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXHKsJwAKCRDPw5SX8bJu
-B/kYAPwKidiqB4rLe1TLWcH274FWSjQ1ak5m6WseZEGyq6YTEQD/dDctqmmj2MBf
-vSp3yJvO73Nlr4vtcaXmSov878ozqho=
-=5ORl
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXJ6miAAKCRDPw5SX8bJu
+B9W1AP9NDgT5v5BjtCIgW9lY42lhx55M9YE/QBpzrKSeeYrjrAD7B9Cp9D7R5Ck/
+EqYSWWLubPUmJRFhjyQHCqBJLpAQWuA=
+=GtS2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hashboot/hashboot-9999.ebuild b/sys-apps/hashboot/hashboot-9999.ebuild
index 2f0aad8db..d37849abd 100644
--- a/sys-apps/hashboot/hashboot-9999.ebuild
+++ b/sys-apps/hashboot/hashboot-9999.ebuild
@@ -12,26 +12,14 @@ HOMEPAGE="https://github.com/tastytea/hashboot/"
 LICENSE="hug-ware"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="firmware"
 
-RDEPEND="
-	sys-apps/coreutils
-	app-arch/tar
-	sys-apps/findutils
-	sys-apps/grep
-	virtual/awk
-	app-shells/bash:*
-	sys-apps/util-linux
-	sys-apps/diffutils
-	sys-apps/sed
-	app-text/asciidoc
-"
-DEPEND="sys-apps/grep"
+RDEPEND="firmware? ( sys-apps/flashrom )"
+DEPEND="app-text/asciidoc"
 
 src_preinst() {
 	default
-	if grep -q '^rc_parallel="YES"' /etc/rc.conf
-	then
+	if grep -q '^rc_parallel="YES"' /etc/rc.conf; then
 		ewarn "hashboot does not work properly with parallel boot enabled."
 	fi
 }
@@ -41,8 +29,8 @@ src_compile() {
 }
 
 src_install() {
-	dodoc README.md
+	default
 	dobin hashboot
-	newinitd initscript.openrc hashboot
+	newinitd init/openrc hashboot
 	doman ${PN}.1
 }
diff --git a/sys-apps/hashboot/metadata.xml b/sys-apps/hashboot/metadata.xml
index d68ff962c..dbdc24743 100644
--- a/sys-apps/hashboot/metadata.xml
+++ b/sys-apps/hashboot/metadata.xml
@@ -5,4 +5,14 @@
     <email>gentoo@tastytea.de</email>
     <name>tastytea</name>
   </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <name>tastytea</name>
+      <email>tastytea@tastytea.de</email>
+    </maintainer>
+    <bugs-to>https://github.com/tastytea/hashboot/issues</bugs-to>
+  </upstream>
+  <use>
+    <flag name="firmware">Enable firmware support through sys-apps/flashrom.</flag>
+  </use>
 </pkgmetadata>