diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile
index 626a6d2a0046..0b5cda5f0c36 100644
--- a/x11/libinput/Makefile
+++ b/x11/libinput/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	libinput
-DISTVERSION=	1.19.4
-PORTREVISION=	1
+DISTVERSION=	1.21.0
 CATEGORIES=	x11 wayland
-MASTER_SITES=	https://freedesktop.org/software/${PORTNAME}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generic input library
@@ -18,9 +16,13 @@ LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libudev.so:devel/libudev-devd \
 		libmtdev.so:devel/libmtdev
 
-USES=		cpe localbase meson pkgconfig python:run shebangfix tar:xz
+USES=		cpe localbase meson pkgconfig python:run shebangfix tar:bz2
 USE_LDCONFIG=	yes
 
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org
+GL_COMMIT=	${DISTVERSION}
+
 CPE_VENDOR=	freedesktop
 
 MESON_ARGS=	-Ddocumentation=false -Dtests=false
diff --git a/x11/libinput/distinfo b/x11/libinput/distinfo
index 761e759017b7..d8a9e8157287 100644
--- a/x11/libinput/distinfo
+++ b/x11/libinput/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656486120
-SHA256 (libinput-1.19.4.tar.xz) = ff33a570b5a936c81e6c08389a8581c2665311d026ce3d225c88d09c49f9b440
-SIZE (libinput-1.19.4.tar.xz) = 655528
+TIMESTAMP = 1665479009
+SHA256 (libinput-libinput-1.21.0_GL0.tar.gz) = 537cb6f93f533030ee4581353d7c6d110887a267413cbc5ef675bbbca52d47e1
+SIZE (libinput-libinput-1.21.0_GL0.tar.gz) = 989937
diff --git a/x11/libinput/pkg-plist b/x11/libinput/pkg-plist
index d55fb802920d..bc9d6e4b249c 100644
--- a/x11/libinput/pkg-plist
+++ b/x11/libinput/pkg-plist
@@ -4,12 +4,12 @@ lib/libinput.so
 lib/libinput.so.10
 lib/libinput.so.10.13.0
 libdata/pkgconfig/libinput.pc
-libexec/libinput/libinput-debug-events
-%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui
 libexec/libinput/libinput-analyze
 libexec/libinput/libinput-analyze-per-slot-delta
 libexec/libinput/libinput-analyze-recording
 libexec/libinput/libinput-analyze-touch-down-state
+libexec/libinput/libinput-debug-events
+%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui
 libexec/libinput/libinput-debug-tablet
 libexec/libinput/libinput-list-devices
 libexec/libinput/libinput-measure
@@ -21,10 +21,11 @@ libexec/libinput/libinput-measure-touchpad-tap
 libexec/libinput/libinput-quirks
 libexec/libinput/libinput-record
 libexec/libinput/libinput-replay
-man/man1/libinput-analyze.1.gz
+libexec/libinput/libinput-test
 man/man1/libinput-analyze-per-slot-delta.1.gz
 man/man1/libinput-analyze-recording.1.gz
 man/man1/libinput-analyze-touch-down-state.1.gz
+man/man1/libinput-analyze.1.gz
 man/man1/libinput-debug-events.1.gz
 %%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz
 man/man1/libinput-debug-tablet.1.gz
@@ -40,9 +41,9 @@ man/man1/libinput-quirks-validate.1.gz
 man/man1/libinput-quirks.1.gz
 man/man1/libinput-record.1.gz
 man/man1/libinput-replay.1.gz
+man/man1/libinput-test.1.gz
 man/man1/libinput.1.gz
 %%DATADIR%%/10-generic-keyboard.quirks
-%%DATADIR%%/10-generic-lid.quirks
 %%DATADIR%%/10-generic-mouse.quirks
 %%DATADIR%%/10-generic-trackball.quirks
 %%DATADIR%%/30-vendor-a4tech.quirks
@@ -57,7 +58,6 @@ man/man1/libinput.1.gz
 %%DATADIR%%/30-vendor-madcatz.quirks
 %%DATADIR%%/30-vendor-microsoft.quirks
 %%DATADIR%%/30-vendor-razer.quirks
-%%DATADIR%%/30-vendor-starlabs.quirks
 %%DATADIR%%/30-vendor-synaptics.quirks
 %%DATADIR%%/30-vendor-trust.quirks
 %%DATADIR%%/30-vendor-vmware.quirks
@@ -77,9 +77,8 @@ man/man1/libinput.1.gz
 %%DATADIR%%/50-system-huawei.quirks
 %%DATADIR%%/50-system-lenovo.quirks
 %%DATADIR%%/50-system-pine64.quirks
-%%DATADIR%%/50-system-prestigio.quirks
-%%DATADIR%%/50-system-purism.quirks
 %%DATADIR%%/50-system-sony.quirks
+%%DATADIR%%/50-system-starlabs.quirks
 %%DATADIR%%/50-system-system76.quirks
 %%DATADIR%%/50-system-toshiba.quirks
 share/zsh/site-functions/_libinput