diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index 428a10431f02..c3eb6691a27b 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2018/08/22 09:48:05 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.3 2018/09/19 09:33:52 leot Exp $
 
-DISTNAME=	xdotool-2.20110530.1
-PKGREVISION=     1
-CATEGORIES=     x11
-MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/semicomplete/
+DISTNAME=	xdotool-3.20160805.1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jordansissel/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	rga@sdf.lonestar.org
 HOMEPAGE=	http://www.semicomplete.com/projects/xdotool/
 COMMENT=	Simulate keyboard input and mouse activity using X11 xtest extension
 LICENSE=	modified-bsd
 
-NO_CONFIGURE=   yes
-USE_LIBTOOL=    yes
-USE_TOOLS+=	gmake
-USE_TOOLS+=     pkg-config
+# XXX: The -rpath fix leads to `gcc: Missing argument for -Wl,-rpath'
+# XXX: and build failure.
+MAKE_ENV+=	WITHOUT_RPATH_FIX=1
+
+USE_TOOLS+=	gmake pod2man pkg-config
+
+USE_LANGUAGES=	c99
 
 SUBST_CLASSES+=           fix-getopt
 SUBST_STAGE.fix-getopt=   pre-build
@@ -22,8 +24,8 @@ SUBST_MESSAGE.fix-getopt= Fixing getopt
 SUBST_FILES.fix-getopt=   *.c
 SUBST_SED.fix-getopt+=    -e 's,getopt_long_only,getopt_long,g'
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdotool/PLIST b/x11/xdotool/PLIST
index 99c8b6351ed4..85497c32c35f 100644
--- a/x11/xdotool/PLIST
+++ b/x11/xdotool/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/28 11:30:53 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/09/19 09:33:52 leot Exp $
 bin/xdotool
 include/xdo.h
 lib/libxdo.so
-lib/libxdo.so.2
+lib/libxdo.so.3
 man/man1/xdotool.1
diff --git a/x11/xdotool/distinfo b/x11/xdotool/distinfo
index 52f7c0601219..a0bc7ff25406 100644
--- a/x11/xdotool/distinfo
+++ b/x11/xdotool/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/08/28 11:30:53 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2018/09/19 09:33:52 leot Exp $
 
-SHA1 (xdotool-2.20110530.1.tar.gz) = bf8372b2e76e8ee3884763cee6e8b3f66bf29aa6
-RMD160 (xdotool-2.20110530.1.tar.gz) = 1aebcd835a4741a9e77aa489a3bdce195c582204
-Size (xdotool-2.20110530.1.tar.gz) = 107204 bytes
+SHA1 (xdotool-3.20160805.1.tar.gz) = 1d98f4905f30a6e52922417e54e62bb3b80f92aa
+RMD160 (xdotool-3.20160805.1.tar.gz) = b534e475adb220d0d9b3fe0d64e77bd0befa602f
+SHA512 (xdotool-3.20160805.1.tar.gz) = cf0b1c31e63a43759ff3f081f3b005dd9fe9cabd2f606d7d1238c7ea9c0526681f6ad7883c69ab9194d19a9584c3707f10306be1e826e5953da30838007dd471
+Size (xdotool-3.20160805.1.tar.gz) = 106026 bytes
+SHA1 (patch-Makefile) = fa116f5bd21ed36995acf957983b3f3e5d6bddb0
diff --git a/x11/xdotool/patches/patch-Makefile b/x11/xdotool/patches/patch-Makefile
new file mode 100644
index 000000000000..9d4fb5fc8971
--- /dev/null
+++ b/x11/xdotool/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2018/09/19 09:33:52 leot Exp $
+
+Properly set permissions of header files (do not need executable bit).
+
+--- Makefile.orig	2016-08-05 17:37:12.000000000 +0000
++++ Makefile
+@@ -98,7 +98,7 @@ installlib: libxdo.$(LIBSUFFIX)
+ .PHONY: installheader
+ installheader: xdo.h
+ 	install -d $(DINSTALLINCLUDE)
+-	install xdo.h $(DINSTALLINCLUDE)/xdo.h
++	install -m 644 xdo.h $(DINSTALLINCLUDE)/xdo.h
+ 
+ .PHONY: installman
+ installman: xdotool.1