diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index edded2c54478..63eb0b27862f 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -1,17 +1,14 @@
 PORTNAME=	xf86-input-joystick
-PORTVERSION=	1.6.3
-PORTREVISION=	5
+DISTVERSION=	1.6.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org joystick input driver
-WWW=		https://www.x.org/
+WWW=		https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pathfix xorg-cat:driver
-
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES=		pathfix tar:xz xorg-cat:driver
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index fdcd2da29ac5..fd9bea19079d 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484349908
-SHA256 (xorg/driver/xf86-input-joystick-1.6.3.tar.bz2) = 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab
-SIZE (xorg/driver/xf86-input-joystick-1.6.3.tar.bz2) = 351846
+TIMESTAMP = 1783019181
+SHA256 (xorg/driver/xf86-input-joystick-1.6.4.tar.xz) = 905ec485fabc699b1cb21518cbd152246776fa83570e09c5822ca0973733ccd2
+SIZE (xorg/driver/xf86-input-joystick-1.6.4.tar.xz) = 296132
diff --git a/x11-drivers/xf86-input-joystick/pkg-descr b/x11-drivers/xf86-input-joystick/pkg-descr
index 3ba1b1df3e51..f0268cf2765b 100644
--- a/x11-drivers/xf86-input-joystick/pkg-descr
+++ b/x11-drivers/xf86-input-joystick/pkg-descr
@@ -1 +1,4 @@
-This package contains the X.Org xf86-input-joystick driver.
+Joystick is an Xorg input driver for controlling the pointer with a
+joystick device.
+It is not recommended to enable the joystick input driver by default
+unless explicitly requested by the user.