diff --git a/www-misc/remwharead/Manifest b/www-misc/remwharead/Manifest
index 931c2ceb1..4563cd2e4 100644
--- a/www-misc/remwharead/Manifest
+++ b/www-misc/remwharead/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST remwharead-0.8.5.tar.gz 48473 BLAKE2B 5b0744310ecdc88b6135a3f4704e65466495d1245962470264ed839286bd1bc0acf0687ecaf30048ae246fa6d7b8482c078ce37d756bafb6f602fee1bb499197 SHA512 f994126a6ca099562825851836599528630a146656bf2e9c5e0ebc086da464b06b2d8f6145e7aca1b7842ee42d2c3d81e543263d7110fe91fca9fdee0cee1197
-EBUILD remwharead-0.8.5.ebuild 1384 BLAKE2B 84ace83da3a6ee47cf8f42a722c10938a89a043cfecdeb765f75a4963f4ebedf946254c573018a48d8bd2b994a58b1421573261f5bc03b66ef442490415d594f SHA512 97320134338a3ad306c40d0a6cf14bbb47871efa3b8d10fec28154ea6d8b93a692efd5ddf351bb0734f9dbd0d67594deabe09825be8c0c2a133bee4c7307d352
-EBUILD remwharead-9999.ebuild 1384 BLAKE2B 84ace83da3a6ee47cf8f42a722c10938a89a043cfecdeb765f75a4963f4ebedf946254c573018a48d8bd2b994a58b1421573261f5bc03b66ef442490415d594f SHA512 97320134338a3ad306c40d0a6cf14bbb47871efa3b8d10fec28154ea6d8b93a692efd5ddf351bb0734f9dbd0d67594deabe09825be8c0c2a133bee4c7307d352
-MISC metadata.xml 690 BLAKE2B b67b1468a4464675b03d1a1de3574ed6e3ebe4df4426b31392c26efabecb6b67e54461d37ffb5a4e0f2f44b38c726de3ac3303f09195c05444fdd81483e644d0 SHA512 7dd29a5bfa54bd640ce331d85df776b9a19e50c935ba470bc1beaf017cdf0fbdc20fcf56043ede2f19162218e04ebd80b0ce47483dafb123f06346aa13164a90
+DIST remwharead-0.8.6.tar.gz 54802 BLAKE2B 3c16fdb152311e803cf38c567bd77e77dff85c55f06f851ad608df478ab4eec29981195a6e3d1f7237b0c8e97ea3ecf9dc4a29f98e9e0fc1f3fe77f074340c64 SHA512 c4a369efdee6223f0f09c68fe0863869e70dfa251dd9494642ca6540fe37644997ddd0ec4d1dc77b4ae1c335978398fabb937254360a6973641edd51ce812101
+EBUILD remwharead-0.8.6.ebuild 1384 BLAKE2B 84ace83da3a6ee47cf8f42a722c10938a89a043cfecdeb765f75a4963f4ebedf946254c573018a48d8bd2b994a58b1421573261f5bc03b66ef442490415d594f SHA512 97320134338a3ad306c40d0a6cf14bbb47871efa3b8d10fec28154ea6d8b93a692efd5ddf351bb0734f9dbd0d67594deabe09825be8c0c2a133bee4c7307d352
+EBUILD remwharead-9999.ebuild 1472 BLAKE2B fc92b62d4f8eead37d58156fea49a1744c2c36f59feb4c290faf28692b243d83ee206278063580cbb57af7f8510b78f1de5cb1c252d2df6b7d75af7afe748fb1 SHA512 f3bf487ae7d285905b225eefbf6f24d75d4440ace0d694821fa2d95225e7a3d3c6f601cca8fb8bbb616c44d4a5476b659ae11cbd8f1e9ec1341ccd06e5cd4b2b
+MISC metadata.xml 758 BLAKE2B 6b78a79ee1487c4b55ab3362756671815929b9a25f8bfc3de4f7a5ccc26a00376c30b28a1bb417229893ab723e36b4c97bac563848f1835d3b8e884be3094567 SHA512 29ee949be898d5fbeb4cab39553b29536a6ba75c41d5cc37dace763832d311eb37314a8bb57559537cfd32f96b5ff856614dae68d931958326e1d8c55c4be57d
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXaXWmwAKCRDPw5SX8bJu
-B1zFAP4qtyi4O5WUuveQKrp6Wqj4ARaYk5OS0/rcsEl23AqoWAD8DgB6rzoWZeL5
-WVIa2ZABQo1qcD/GYGbJFOKLMNJhKR8=
-=zMCi
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXd+u1wAKCRDPw5SX8bJu
+B5TiAP4j05rLNqZsYE7moBf1U0T2T3L5O8IdZ8ermYUwajYanwD+I1VmID3nG1bh
+U/vy+qRSlvVt0imTLttR76g0bprnjDg=
+=EQK6
 -----END PGP SIGNATURE-----
diff --git a/www-misc/remwharead/metadata.xml b/www-misc/remwharead/metadata.xml
index 7febf5edf..589b0ce64 100644
--- a/www-misc/remwharead/metadata.xml
+++ b/www-misc/remwharead/metadata.xml
@@ -2,19 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <longdescription>
-    remwharead saves URIs of things you want to remember in a database
-    along with an URI to the archived version, the current date and
-    time, title, description, the full text of the page and optional
-    tags.
+	remwharead saves URIs of things you want to remember in a database
+	along with an URI to the archived version, the current date and
+	time, title, description, the full text of the page and optional
+	tags.
   </longdescription>
   <maintainer type="person">
-    <email>gentoo@tastytea.de</email>
-    <name>tastytea</name>
+	<email>gentoo@tastytea.de</email>
+	<name>tastytea</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://schlomp.space/tastytea/remwharead/issues</bugs-to>
+	<bugs-to>https://schlomp.space/tastytea/remwharead/issues</bugs-to>
   </upstream>
   <use>
-    <flag name="firefox">Install wrapper for Firefox-plugin</flag>
+	<flag name="firefox">Install wrapper for Firefox-plugin</flag>
+	<flag name="rofi">Add support for x11-misc/rofi with the 'remwharead-rofi' program.</flag>
   </use>
 </pkgmetadata>
diff --git a/www-misc/remwharead/remwharead-0.8.5.ebuild b/www-misc/remwharead/remwharead-0.8.6.ebuild
similarity index 100%
rename from www-misc/remwharead/remwharead-0.8.5.ebuild
rename to www-misc/remwharead/remwharead-0.8.6.ebuild
diff --git a/www-misc/remwharead/remwharead-9999.ebuild b/www-misc/remwharead/remwharead-9999.ebuild
index f2d1ef17f..62b905677 100644
--- a/www-misc/remwharead/remwharead-9999.ebuild
+++ b/www-misc/remwharead/remwharead-9999.ebuild
@@ -24,13 +24,14 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="doc +firefox test"
+IUSE="doc +firefox rofi test"
 
 RDEPEND="
 	>=dev-cpp/curlpp-0.8.1
 	dev-libs/libxdg-basedir
 	dev-db/vsqlite++
 	dev-libs/icu
+	rofi? ( x11-misc/rofi )
 "
 DEPEND="
 	${RDEPEND}
@@ -58,7 +59,7 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use doc; then
-		./build_doc.sh
+		./build_doc.sh || die
 	fi
 }
 
@@ -67,6 +68,8 @@ src_install() {
 		HTML_DOCS="doc/html/*"
 	fi
 
+	use rofi && dobin scripts/remwharead-rofi || die
+
 	cmake-utils_src_install
 }