diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index 29d4d2e02f96..dc85cfeb3ba5 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -1,35 +1,40 @@
 PORTNAME=	xdotool
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.20160805.1
-PORTEPOCH=	1
+DISTVERSION=	3.20210804.2
 CATEGORIES=	x11
 
-MAINTAINER=	gregf@hugops.pw
+MAINTAINER=	gregf@beastie.tech
 COMMENT=	Programmatically simulate keyboard input or mouse activity
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
 
+USES=		gmake pkgconfig perl5 xorg
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	jordansissel
 
 USE_LDCONFIG=	yes
-USES=		gmake pkgconfig perl5 xorg
-USE_XORG=	x11 xtst xinerama
 USE_PERL5=	build
+USE_XORG=	x11 xtst xi xinerama
+
+PLIST_FILES=	bin/xdotool \
+		include/xdo.h \
+		lib/libxdo.so \
+		lib/libxdo.so.3 \
+		libdata/pkgconfig/libxdo.pc \
+		man/man1/xdotool.1.gz
 
-PLIST_FILES=	bin/xdotool include/xdo.h lib/libxdo.so \
-		lib/libxdo.so.3 man/man1/xdotool.1.gz
 
 # Older GCC on RELENG_6 doesn't like -Wno-missing-field-initializers
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Wno-missing-field-initializers,,' \
 		${WRKSRC}/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdotool \
 		${STAGEDIR}${PREFIX}/lib/libxdo.so.3
 
 .include <bsd.port.mk>
diff --git a/x11/xdotool/distinfo b/x11/xdotool/distinfo
index 539e853b582e..633b56249780 100644
--- a/x11/xdotool/distinfo
+++ b/x11/xdotool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481639544
-SHA256 (jordansissel-xdotool-v3.20160805.1_GH0.tar.gz) = ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a
-SIZE (jordansissel-xdotool-v3.20160805.1_GH0.tar.gz) = 106026
+TIMESTAMP = 1628709090
+SHA256 (jordansissel-xdotool-v3.20210804.2_GH0.tar.gz) = 5bd76b81df670a34e7d8e71918b71df5c28c56212317e5ee07d7e593045a64a9
+SIZE (jordansissel-xdotool-v3.20210804.2_GH0.tar.gz) = 111795