diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index 3518806f6680..674a08fe5b30 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -1,40 +1,37 @@
 PORTNAME=	xdotool
-DISTVERSIONPREFIX=	v
-DISTVERSION=	3.20210804.2
+DISTVERSION=	3.20211022.1
 PORTEPOCH=	1
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/jordansissel/xdotool/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 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
+USES=		gmake perl5 pkgconfig xorg
 
 USE_LDCONFIG=	yes
 USE_PERL5=	build
-USE_XORG=	x11 xtst xi xinerama
+USE_XORG=	x11 xi xinerama xtst
 
 PLIST_FILES=	bin/xdotool \
 		include/xdo.h \
 		lib/libxdo.so \
 		lib/libxdo.so.3 \
 		libdata/pkgconfig/libxdo.pc \
 		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-patch:
+#	@${REINPLACE_CMD} -e 's,-Wno-missing-field-initializers,,' \
+#		${WRKSRC}/Makefile
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdotool \
+	${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 633b56249780..7b7609716c09 100644
--- a/x11/xdotool/distinfo
+++ b/x11/xdotool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628709090
-SHA256 (jordansissel-xdotool-v3.20210804.2_GH0.tar.gz) = 5bd76b81df670a34e7d8e71918b71df5c28c56212317e5ee07d7e593045a64a9
-SIZE (jordansissel-xdotool-v3.20210804.2_GH0.tar.gz) = 111795
+TIMESTAMP = 1656260324
+SHA256 (xdotool-3.20211022.1.tar.gz) = 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada
+SIZE (xdotool-3.20211022.1.tar.gz) = 115237