diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
new file mode 100644
index 0000000..52a8c82
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
@@ -0,0 +1,11 @@
+--- a/src/command.C
++++ b/src/command.C
+@@ -2695,7 +2695,7 @@
+         /* kidnapped escape sequence: Should be 8.3.48 */
+       case C1_ESA:		/* ESC G */
+         // used by original rxvt for rob nations own graphics mode
+-        if (cmd_getc () == 'Q')
++        if (cmd_getc () == 'Q' && option (Opt_insecure))
+           tt_printf ("\033G0\012");	/* query graphics - no graphics */
+         break;
+ 
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
similarity index 91%
rename from x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
rename to x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
index 7ba9632..1e52155 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop systemd prefix
+inherit autotools desktop flag-o-matic systemd prefix
 
 COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
 
@@ -14,7 +14,7 @@ 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"
@@ -38,6 +38,7 @@ 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-query-graphics-insecure.patch
 	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
 	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 )
@@ -51,6 +52,9 @@ DOCS=(
 )
 
 src_prepare() {
+	# Bug #787104
+	append-cxxflags -std=c++14
+
 	default
 
 	# kill the rxvt-unicode terminfo file - #192083