diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
index 561132ec1d1ab..aa4defd480523 100644
--- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
@@ -7,8 +7,8 @@
 -XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
 -LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
 -INC=$(shell pkg-config --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
-+XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
-+LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
++XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
 +INC=$(shell $(PKG_CONFIG) --cflags x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
  CFLAGS+=-std=c99 $(INC)
  
diff --git a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
index dfa6b299086f8..f9edc0d6cd832 100644
--- a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
@@ -18,8 +18,14 @@ IUSE="examples"
 # tests have various troublesome requirements
 RESTRICT="test"
 
+# libXi is "unused" but it still uses headers from it and relies on the
+# compiler optimizing out a function to be dropped by as-needed, so keep
+# until next release (not important to patch given libXtst pulls libXi
+# anyway, so the dependency is not really avoidable either way)
+# https://github.com/jordansissel/xdotool/pull/446
 RDEPEND="
 	x11-libs/libX11
+	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libXtst
 	x11-libs/libxkbcommon