diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 7b2e8b1..14fbf48 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,39 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The x11-terms category contains terminal emulators for X11 environments.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie x11-terms enthält Terminalemulatoren für verschiedene
-		Desktopumgebungen und Window Manager.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría x11-terms contiene emuladores de terminal para varios
-		ambientes X11.
-	</longdescription>
-	<longdescription lang="ja">
-		x11-termsカテゴリーにはX11環境で使うターミナル・エミュレーターが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De x11-terms categorie bevat terminalemulators voor verschillende
-		desktopomgevingen en window managers.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm x11-term chứa các terminal emulator cho X11.
-	</longdescription>
-	<longdescription lang="sk">
-		Kategória x11-term obsahuje emulátory terminálu pre prostredia X11.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria x11-terms contiene emulatori di terminale per gli ambienti X11.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria x11-terms contém emuladores de terminal para
-		ambientes X11.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria x11-terms zawiera emulatory terminala dla środowisk X11.
-	</longdescription>
-</catmetadata>
-
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<!-- co-maintainers welcome! -->
+<use>
+<flag name="24-bit-color">Enable 24-bit color support. Note that this feature
+	is unofficial, may cause visual glitches due to the fact there is no
+	termcap/terminfo definition for rxvt-unicode-24bit yet so it is necessary
+	to use the one for 256 colours, visibly increases memory usage, and might
+	slow urxvt down dramatically when more than six fonts are in use in a terminal
+	instance.</flag>
+<flag name="256-color">Enable 256 color support</flag>
+<flag name="blink">Enable blinking text</flag>
+<flag name="fading-colors">Enable colors fading when off focus</flag>
+<flag name="font-styles">Enable support for bold and italic fonts</flag>
+<flag name="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag>
+<flag name="iso14755">Enable ISO-14755 support</flag>
+<flag name="mouse">Enable mouse support</flag>
+<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
+<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+<flag name="sgrmouse">Enable unofficial support for the xterm SGR 1006 mouse-tracking extension.
+	Needed to properly support mouse events for terminals with more than 223
+	rows or columns, in applications not supporting the urxvt 1015 extension.</flag>
+<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+<flag name="utmp">Enable utmp support</flag>
+<flag name="wtmp">Enable wtmp support</flag>
+</use>
+<upstream>
+<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
similarity index 89%
rename from x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
rename to x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
index 78bf609..7ba9632 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop systemd
+inherit autotools desktop systemd prefix
 
 COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
 
@@ -14,10 +14,10 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf
-iso14755 +mousewheel mouse +perl -sgrmouse startup-notification unicode3 +utmp
-+wtmp xft"
+iso14755 +mousewheel mouse +perl -sgrmouse startup-notification unicode3 +utmp +wtmp
+xft"
 
 RESTRICT="test"
 
@@ -37,6 +37,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
 	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+	"${FILESDIR}"/${PN}-9.22-perl-segfault-on-exit.patch
 	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
 	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 )
@@ -57,6 +58,9 @@ src_prepare() {
 
 	use mouse || eapply -p1 "${FILESDIR}"/${P}-disable-mouse.patch
 
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+
 	eautoreconf
 }