diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index a55748f08d14..a384e94001ef 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	5.4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index a8d7008443ca..6bab2f150c3e 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	5.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index a06991c7d7c3..f7046b068714 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	muffin
 PORTVERSION=	5.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm gnome
 DIST_SUBDIR=	gnome
 
diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile
index d97e03af2eef..9e19cd788843 100644
--- a/x11/libinput/Makefile
+++ b/x11/libinput/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libinput
 DISTVERSION=	1.26.2
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libwacom/Makefile b/x11/libwacom/Makefile
index e48d1815b469..2ddbb0d3a91c 100644
--- a/x11/libwacom/Makefile
+++ b/x11/libwacom/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libwacom
-DISTVERSION=	1.5
-PORTREVISION=	1
+DISTVERSION=	2.12.1
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/linuxwacom/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
@@ -8,16 +7,32 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
 WWW=		https://github.com/linuxwacom/libwacom/wiki
 
-LICENSE=	MIT
+LICENSE=	HPND
+LICENSE_NAME=	Historical Permission Notice and Disclaimer
 LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
-LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
+		${PYTHON_PKGNAMEPREFIX}libevdev>0:devel/py-libevdev \
+		${PYTHON_PKGNAMEPREFIX}pyudev>0:devel/py-pyudev \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+LIB_DEPENDS=	libevdev.so:devel/libevdev \
+		libgudev-1.0.so:devel/libgudev
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libevdev>0:devel/py-libevdev
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++11-lang gnome meson pkgconfig tar:bz2
+USES=		compiler:c++11-lang gnome meson pkgconfig python shebangfix \
+		tar:xz
+
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-MESON_ARGS=	-Ddocumentation=disabled
+
+SHEBANG_FILES=	tools/show-stylus.py tools/libwacom-update-db.py
+
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
+		${WRKSRC}/tools/libwacom-update-db.py
 
 .include <bsd.port.mk>
diff --git a/x11/libwacom/distinfo b/x11/libwacom/distinfo
index f1ba3b777f0b..d57cda5b4fa7 100644
--- a/x11/libwacom/distinfo
+++ b/x11/libwacom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601323778
-SHA256 (libwacom-1.5.tar.bz2) = 6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b
-SIZE (libwacom-1.5.tar.bz2) = 515548
+TIMESTAMP = 1718794752
+SHA256 (libwacom-2.12.1.tar.xz) = 5b047a28d20b01dd744e194c56c1ba5db54b5d6ee3a8b2d820a1ad6e33d85572
+SIZE (libwacom-2.12.1.tar.xz) = 152880
diff --git a/x11/libwacom/files/patch-tools_libwacom-update-db.py b/x11/libwacom/files/patch-tools_libwacom-update-db.py
new file mode 100644
index 000000000000..8663ed7e5180
--- /dev/null
+++ b/x11/libwacom/files/patch-tools_libwacom-update-db.py
@@ -0,0 +1,20 @@
+--- tools/libwacom-update-db.py.orig	2024-06-19 10:34:43 UTC
++++ tools/libwacom-update-db.py
+@@ -189,7 +189,7 @@ if __name__ == "__main__":
+         "path",
+         nargs="?",
+         type=Path,
+-        default="/etc/libwacom",
++        default="%%PREFIX%%/etc/libwacom",
+         help="Directory to load .tablet files from",
+     )
+     # buildsystem-mode is what we use from meson, it changes the
+@@ -203,7 +203,7 @@ if __name__ == "__main__":
+     parser.add_argument(
+         "--skip-systemd-hwdb-update",
+         action="store_true",
+-        default=False,
++        default=True,
+         help="Do not run systemd-hwdb --update (Note: updates to tablet files will not be reflected in udev)",
+     )
+     parser.add_argument(
diff --git a/x11/libwacom/pkg-plist b/x11/libwacom/pkg-plist
index aeb4cc17f377..08a7a085ac48 100644
--- a/x11/libwacom/pkg-plist
+++ b/x11/libwacom/pkg-plist
@@ -1,12 +1,14 @@
+bin/libwacom-list-devices
 bin/libwacom-list-local-devices
+bin/libwacom-show-stylus
+bin/libwacom-update-db
 include/libwacom-1.0/libwacom/libwacom.h
 lib/libwacom.so
-lib/libwacom.so.2
-lib/libwacom.so.2.6.1
+lib/libwacom.so.9
+lib/libwacom.so.9.0.0
 lib/udev/hwdb.d/65-libwacom.hwdb
 lib/udev/rules.d/65-libwacom.rules
 libdata/pkgconfig/libwacom.pc
-share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/bamboo-0fg-m-p-alt.tablet
 %%DATADIR%%/bamboo-0fg-s-p-alt.tablet
 %%DATADIR%%/bamboo-0fg-s-p.tablet
@@ -30,6 +32,7 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/bamboo-one.tablet
 %%DATADIR%%/bamboo-pad-wireless.tablet
 %%DATADIR%%/bamboo-pad.tablet
+%%DATADIR%%/chuwi-minibookx.tablet
 %%DATADIR%%/cintiq-12wx.tablet
 %%DATADIR%%/cintiq-13hd.tablet
 %%DATADIR%%/cintiq-13hdt.tablet
@@ -49,13 +52,19 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/cintiq-companion-hybrid.tablet
 %%DATADIR%%/cintiq-companion.tablet
 %%DATADIR%%/cintiq-pro-13.tablet
+%%DATADIR%%/cintiq-pro-16-2.tablet
 %%DATADIR%%/cintiq-pro-16.tablet
+%%DATADIR%%/cintiq-pro-17.tablet
+%%DATADIR%%/cintiq-pro-22.tablet
 %%DATADIR%%/cintiq-pro-24-p.tablet
 %%DATADIR%%/cintiq-pro-24-pt.tablet
+%%DATADIR%%/cintiq-pro-27.tablet
 %%DATADIR%%/cintiq-pro-32.tablet
 %%DATADIR%%/dell-canvas-27.tablet
+%%DATADIR%%/dtc-121.tablet
 %%DATADIR%%/dtf-720.tablet
 %%DATADIR%%/dth-1152.tablet
+%%DATADIR%%/dth-134.tablet
 %%DATADIR%%/dth-2242.tablet
 %%DATADIR%%/dth-2452.tablet
 %%DATADIR%%/dti-520.tablet
@@ -75,8 +84,12 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/elan-0732.tablet
 %%DATADIR%%/elan-2072.tablet
 %%DATADIR%%/elan-22e2.tablet
+%%DATADIR%%/elan-22f7.tablet
+%%DATADIR%%/elan-24d8.tablet
 %%DATADIR%%/elan-24db.tablet
+%%DATADIR%%/elan-2513.tablet
 %%DATADIR%%/elan-2514-alt.tablet
+%%DATADIR%%/elan-2514-alt2.tablet
 %%DATADIR%%/elan-2514.tablet
 %%DATADIR%%/elan-2537.tablet
 %%DATADIR%%/elan-2627.tablet
@@ -85,9 +98,86 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/elan-264c.tablet
 %%DATADIR%%/elan-29a1.tablet
 %%DATADIR%%/elan-29b6.tablet
+%%DATADIR%%/elan-2a70.tablet
+%%DATADIR%%/elan-2ad9.tablet
+%%DATADIR%%/elan-2bb3.tablet
+%%DATADIR%%/elan-2bd6.tablet
+%%DATADIR%%/elan-2c1b.tablet
+%%DATADIR%%/elan-2d55.tablet
+%%DATADIR%%/elan-2fc2.tablet
+%%DATADIR%%/elan-425a.tablet
+%%DATADIR%%/elan-425b.tablet
 %%DATADIR%%/elan-5515.tablet
+%%DATADIR%%/gaomon-1060pro.tablet
+%%DATADIR%%/gaomon-1061pro.tablet
+%%DATADIR%%/gaomon-a1201.tablet
+%%DATADIR%%/gaomon-a5h.tablet
+%%DATADIR%%/gaomon-a5h_mt.tablet
+%%DATADIR%%/gaomon-a601.tablet
+%%DATADIR%%/gaomon-a801.tablet
+%%DATADIR%%/gaomon-d16-pro.tablet
+%%DATADIR%%/gaomon-d22s.tablet
+%%DATADIR%%/gaomon-g12.tablet
+%%DATADIR%%/gaomon-g12gd.tablet
+%%DATADIR%%/gaomon-g13.tablet
+%%DATADIR%%/gaomon-g13gd.tablet
+%%DATADIR%%/gaomon-g16.tablet
+%%DATADIR%%/gaomon-g16gd.tablet
+%%DATADIR%%/gaomon-g22.tablet
+%%DATADIR%%/gaomon-gm116hd.tablet
+%%DATADIR%%/gaomon-gm116hdtp.tablet
+%%DATADIR%%/gaomon-gm156hd.tablet
+%%DATADIR%%/gaomon-gm156hdtp.tablet
+%%DATADIR%%/gaomon-gm185.tablet
+%%DATADIR%%/gaomon-gm220hd.tablet
+%%DATADIR%%/gaomon-gm24.tablet
+%%DATADIR%%/gaomon-gm24tp.tablet
+%%DATADIR%%/gaomon-gt-1106.tablet
+%%DATADIR%%/gaomon-gt116h.tablet
+%%DATADIR%%/gaomon-jr156.tablet
+%%DATADIR%%/gaomon-m0610-pro.tablet
+%%DATADIR%%/gaomon-m10.tablet
+%%DATADIR%%/gaomon-m106k-pro.tablet
+%%DATADIR%%/gaomon-m106k.tablet
+%%DATADIR%%/gaomon-m10k-2018.tablet
+%%DATADIR%%/gaomon-m10k-pro.tablet
+%%DATADIR%%/gaomon-m1220.tablet
+%%DATADIR%%/gaomon-m1230.tablet
+%%DATADIR%%/gaomon-m6.tablet
+%%DATADIR%%/gaomon-m62022.tablet
+%%DATADIR%%/gaomon-m7.tablet
+%%DATADIR%%/gaomon-m8.tablet
+%%DATADIR%%/gaomon-pd1161.tablet
+%%DATADIR%%/gaomon-pd1161gd.tablet
+%%DATADIR%%/gaomon-pd1220.tablet
+%%DATADIR%%/gaomon-pd1220gd.tablet
+%%DATADIR%%/gaomon-pd1320.tablet
+%%DATADIR%%/gaomon-pd1320gd.tablet
+%%DATADIR%%/gaomon-pd1560.tablet
+%%DATADIR%%/gaomon-pd1561.tablet
+%%DATADIR%%/gaomon-pd1561gd.tablet
+%%DATADIR%%/gaomon-pd156pro.tablet
+%%DATADIR%%/gaomon-pd156progd.tablet
+%%DATADIR%%/gaomon-pd1610.tablet
+%%DATADIR%%/gaomon-pd1611.tablet
+%%DATADIR%%/gaomon-pd1620.tablet
+%%DATADIR%%/gaomon-pd1621.tablet
+%%DATADIR%%/gaomon-pd2200.tablet
+%%DATADIR%%/gaomon-pd2400.tablet
+%%DATADIR%%/gaomon-pd2401.tablet
 %%DATADIR%%/gaomon-s56k.tablet
 %%DATADIR%%/gaomon-s620.tablet
+%%DATADIR%%/gaomon-s630.tablet
+%%DATADIR%%/gaomon-s830.tablet
+%%DATADIR%%/gaomon-sn540-m5.tablet
+%%DATADIR%%/gaomon-sp1603.tablet
+%%DATADIR%%/gaomon-t01.tablet
+%%DATADIR%%/gaomon-t02.tablet
+%%DATADIR%%/gaomon-tm156w.tablet
+%%DATADIR%%/gaomon-u16-tp4k.tablet
+%%DATADIR%%/gaomon-u164k.tablet
+%%DATADIR%%/gaomon-wh850.tablet
+%%DATADIR%%/gaomon-wh851.tablet
 %%DATADIR%%/generic.tablet
 %%DATADIR%%/graphire-usb.tablet
 %%DATADIR%%/graphire-wireless-8x6.tablet
@@ -97,10 +187,79 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/graphire3-6x8.tablet
 %%DATADIR%%/graphire4-4x5.tablet
 %%DATADIR%%/graphire4-6x8.tablet
+%%DATADIR%%/hp-pro-tablet-408.tablet
 %%DATADIR%%/huion-420.tablet
+%%DATADIR%%/huion-gc610-710.tablet
+%%DATADIR%%/huion-h1060p.tablet
 %%DATADIR%%/huion-h420.tablet
 %%DATADIR%%/huion-h610-pro.tablet
+%%DATADIR%%/huion-h640p.tablet
+%%DATADIR%%/huion-h950p-igg.tablet
+%%DATADIR%%/huion-h950p.tablet
+%%DATADIR%%/huion-hc16.tablet
+%%DATADIR%%/huion-hs610.tablet
+%%DATADIR%%/huion-hs611.tablet
+%%DATADIR%%/huion-hs64.tablet
+%%DATADIR%%/huion-hs95.tablet
+%%DATADIR%%/huion-hst640.tablet
+%%DATADIR%%/huion-inspiroy-2-l---h1061p.tablet
+%%DATADIR%%/huion-inspiroy-2-m---h951p.tablet
+%%DATADIR%%/huion-inspiroy-2-s---h641p.tablet
+%%DATADIR%%/huion-inspiroy-dial-2.tablet
+%%DATADIR%%/huion-inspiroy-dial-q620m.tablet
+%%DATADIR%%/huion-inspiroy-g10t.tablet
+%%DATADIR%%/huion-inspiroy-giano.tablet
+%%DATADIR%%/huion-inspiroy-h1161.tablet
+%%DATADIR%%/huion-inspiroy-h420x.tablet
+%%DATADIR%%/huion-inspiroy-h430p.tablet
+%%DATADIR%%/huion-inspiroy-h580x.tablet
+%%DATADIR%%/huion-inspiroy-h610x.tablet
+%%DATADIR%%/huion-inspiroy-ink-h320m.tablet
+%%DATADIR%%/huion-inspiroy-keydial-kd200.tablet
+%%DATADIR%%/huion-inspiroy-q11k-v2.tablet
+%%DATADIR%%/huion-inspiroy-q11k.tablet
+%%DATADIR%%/huion-inspiroy-q620m.tablet
+%%DATADIR%%/huion-inspiroy-wh1409-v2.tablet
+%%DATADIR%%/huion-kamvas-12-gs1161.tablet
+%%DATADIR%%/huion-kamvas-13.tablet
+%%DATADIR%%/huion-kamvas-16-gs1562.tablet
+%%DATADIR%%/huion-kamvas-162019.tablet
+%%DATADIR%%/huion-kamvas-19.tablet
+%%DATADIR%%/huion-kamvas-20-gs1901.tablet
+%%DATADIR%%/huion-kamvas-22-gs2201.tablet
+%%DATADIR%%/huion-kamvas-22-gs2202.tablet
+%%DATADIR%%/huion-kamvas-24-gs2401.tablet
+%%DATADIR%%/huion-kamvas-24-plus-gs2402.tablet
+%%DATADIR%%/huion-kamvas-gt-156-2021.tablet
+%%DATADIR%%/huion-kamvas-gt-156hd-v2.tablet
+%%DATADIR%%/huion-kamvas-gt-191-v2.tablet
+%%DATADIR%%/huion-kamvas-gt-191.tablet
+%%DATADIR%%/huion-kamvas-gt-220-v2.tablet
+%%DATADIR%%/huion-kamvas-gt-221-pro.tablet
+%%DATADIR%%/huion-kamvas-pro-12-gt-116.tablet
+%%DATADIR%%/huion-kamvas-pro-13-gt1302.tablet
+%%DATADIR%%/huion-kamvas-pro-16-gt-156.tablet
+%%DATADIR%%/huion-kamvas-pro-16-gt1561.tablet
+%%DATADIR%%/huion-kamvas-pro-16-gt1602.tablet
+%%DATADIR%%/huion-kamvas-pro-16-plus-gt1562.tablet
+%%DATADIR%%/huion-kamvas-pro-20-gt-192.tablet
+%%DATADIR%%/huion-kamvas-pro-20-gt1901.tablet
+%%DATADIR%%/huion-kamvas-pro-22-gt-221.tablet
+%%DATADIR%%/huion-kamvas-pro-24-gt2401.tablet
+%%DATADIR%%/huion-kamvas-pro-24.tablet
+%%DATADIR%%/huion-kamvas-pro-studio-22.tablet
+%%DATADIR%%/huion-kamvas-rds-220.tablet
+%%DATADIR%%/huion-kizuna-hs952.tablet
+%%DATADIR%%/huion-mini-keydial-kd100.tablet
 %%DATADIR%%/huion-new-1060-plus.tablet
+%%DATADIR%%/huion-note-x10.tablet
+%%DATADIR%%/huion-rds-160.tablet
+%%DATADIR%%/huion-rte-100.tablet
+%%DATADIR%%/huion-rtm-500.tablet
+%%DATADIR%%/huion-rtp-700.tablet
+%%DATADIR%%/huion-rts-300.tablet
+%%DATADIR%%/huion-wh1409.tablet
+%%DATADIR%%/ingenic-6161.tablet
 %%DATADIR%%/intuos-12x12.tablet
 %%DATADIR%%/intuos-12x18.tablet
 %%DATADIR%%/intuos-4x5.tablet
@@ -150,6 +309,7 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/intuos5-touch-l.tablet
 %%DATADIR%%/intuos5-touch-m.tablet
 %%DATADIR%%/intuos5-touch-s.tablet
+%%DATADIR%%/isdv4-016c.tablet
 %%DATADIR%%/isdv4-100.tablet
 %%DATADIR%%/isdv4-101.tablet
 %%DATADIR%%/isdv4-104.tablet
@@ -159,13 +319,23 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-114.tablet
 %%DATADIR%%/isdv4-116.tablet
 %%DATADIR%%/isdv4-117.tablet
+%%DATADIR%%/isdv4-121a.tablet
 %%DATADIR%%/isdv4-124.tablet
 %%DATADIR%%/isdv4-12c.tablet
 %%DATADIR%%/isdv4-149.tablet
 %%DATADIR%%/isdv4-2d1f-001e.tablet
+%%DATADIR%%/isdv4-2d1f-002c.tablet
 %%DATADIR%%/isdv4-2d1f-002e.tablet
+%%DATADIR%%/isdv4-2d1f-0040.tablet
+%%DATADIR%%/isdv4-2d1f-0066.tablet
+%%DATADIR%%/isdv4-2d1f-0095.tablet
+%%DATADIR%%/isdv4-2d1f-0114.tablet
+%%DATADIR%%/isdv4-2d1f-0136.tablet
+%%DATADIR%%/isdv4-2d1f-0163.tablet
+%%DATADIR%%/isdv4-2d1f-524c.tablet
 %%DATADIR%%/isdv4-4004.tablet
 %%DATADIR%%/isdv4-4800.tablet
+%%DATADIR%%/isdv4-4804.tablet
 %%DATADIR%%/isdv4-4806.tablet
 %%DATADIR%%/isdv4-4807.tablet
 %%DATADIR%%/isdv4-4809.tablet
@@ -174,9 +344,12 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-4822.tablet
 %%DATADIR%%/isdv4-4824.tablet
 %%DATADIR%%/isdv4-4831.tablet
+%%DATADIR%%/isdv4-4834.tablet
 %%DATADIR%%/isdv4-4838.tablet
 %%DATADIR%%/isdv4-4841.tablet
 %%DATADIR%%/isdv4-484c.tablet
+%%DATADIR%%/isdv4-484d.tablet
+%%DATADIR%%/isdv4-484e.tablet
 %%DATADIR%%/isdv4-4851.tablet
 %%DATADIR%%/isdv4-485e.tablet
 %%DATADIR%%/isdv4-4865.tablet
@@ -184,21 +357,32 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-4870.tablet
 %%DATADIR%%/isdv4-4875.tablet
 %%DATADIR%%/isdv4-488f.tablet
+%%DATADIR%%/isdv4-4898.tablet
+%%DATADIR%%/isdv4-48b7.tablet
 %%DATADIR%%/isdv4-48c9.tablet
 %%DATADIR%%/isdv4-48ca.tablet
 %%DATADIR%%/isdv4-48ce.tablet
 %%DATADIR%%/isdv4-48d6.tablet
+%%DATADIR%%/isdv4-48eb.tablet
 %%DATADIR%%/isdv4-48ec.tablet
 %%DATADIR%%/isdv4-48ed.tablet
 %%DATADIR%%/isdv4-48ee.tablet
+%%DATADIR%%/isdv4-48f6.tablet
+%%DATADIR%%/isdv4-490a.tablet
 %%DATADIR%%/isdv4-490b.tablet
 %%DATADIR%%/isdv4-4957.tablet
 %%DATADIR%%/isdv4-495f.tablet
+%%DATADIR%%/isdv4-496c.tablet
+%%DATADIR%%/isdv4-4988.tablet
+%%DATADIR%%/isdv4-4995.tablet
+%%DATADIR%%/isdv4-49a3.tablet
+%%DATADIR%%/isdv4-49c8.tablet
 %%DATADIR%%/isdv4-5000.tablet
 %%DATADIR%%/isdv4-5002.tablet
 %%DATADIR%%/isdv4-5010.tablet
 %%DATADIR%%/isdv4-5013.tablet
 %%DATADIR%%/isdv4-5014.tablet
+%%DATADIR%%/isdv4-5019.tablet
 %%DATADIR%%/isdv4-502a.tablet
 %%DATADIR%%/isdv4-503e.tablet
 %%DATADIR%%/isdv4-503f.tablet
@@ -206,10 +390,15 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-5044.tablet
 %%DATADIR%%/isdv4-5048.tablet
 %%DATADIR%%/isdv4-504a.tablet
+%%DATADIR%%/isdv4-504c.tablet
+%%DATADIR%%/isdv4-5072.tablet
 %%DATADIR%%/isdv4-5090.tablet
+%%DATADIR%%/isdv4-5093.tablet
 %%DATADIR%%/isdv4-5099.tablet
 %%DATADIR%%/isdv4-509d.tablet
 %%DATADIR%%/isdv4-509f.tablet
+%%DATADIR%%/isdv4-50a0.tablet
+%%DATADIR%%/isdv4-50a9.tablet
 %%DATADIR%%/isdv4-50b4.tablet
 %%DATADIR%%/isdv4-50b6.tablet
 %%DATADIR%%/isdv4-50b8.tablet
@@ -219,17 +408,22 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-50f1.tablet
 %%DATADIR%%/isdv4-50f8.tablet
 %%DATADIR%%/isdv4-50fd.tablet
+%%DATADIR%%/isdv4-50fe.tablet
 %%DATADIR%%/isdv4-5110.tablet
 %%DATADIR%%/isdv4-5115.tablet
+%%DATADIR%%/isdv4-511a.tablet
 %%DATADIR%%/isdv4-5122.tablet
 %%DATADIR%%/isdv4-5128.tablet
 %%DATADIR%%/isdv4-513b.tablet
 %%DATADIR%%/isdv4-5144.tablet
 %%DATADIR%%/isdv4-5146.tablet
 %%DATADIR%%/isdv4-5147.tablet
+%%DATADIR%%/isdv4-5148.tablet
 %%DATADIR%%/isdv4-5150.tablet
+%%DATADIR%%/isdv4-5155.tablet
 %%DATADIR%%/isdv4-5157.tablet
 %%DATADIR%%/isdv4-5158.tablet
+%%DATADIR%%/isdv4-5159.tablet
 %%DATADIR%%/isdv4-515a.tablet
 %%DATADIR%%/isdv4-5169.tablet
 %%DATADIR%%/isdv4-516b.tablet
@@ -252,12 +446,44 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-51be.tablet
 %%DATADIR%%/isdv4-51bf.tablet
 %%DATADIR%%/isdv4-51c4.tablet
+%%DATADIR%%/isdv4-51c7.tablet
+%%DATADIR%%/isdv4-51d0.tablet
 %%DATADIR%%/isdv4-51e2.tablet
+%%DATADIR%%/isdv4-51e9.tablet
+%%DATADIR%%/isdv4-51ef.tablet
 %%DATADIR%%/isdv4-51f5.tablet
 %%DATADIR%%/isdv4-51f6.tablet
+%%DATADIR%%/isdv4-51f9.tablet
+%%DATADIR%%/isdv4-5202.tablet
+%%DATADIR%%/isdv4-5204.tablet
+%%DATADIR%%/isdv4-5215.tablet
+%%DATADIR%%/isdv4-5216.tablet
+%%DATADIR%%/isdv4-5218.tablet
+%%DATADIR%%/isdv4-521c.tablet
 %%DATADIR%%/isdv4-521f.tablet
+%%DATADIR%%/isdv4-5220.tablet
 %%DATADIR%%/isdv4-5221.tablet
 %%DATADIR%%/isdv4-5222.tablet
+%%DATADIR%%/isdv4-5229.tablet
+%%DATADIR%%/isdv4-523a.tablet
+%%DATADIR%%/isdv4-523e.tablet
+%%DATADIR%%/isdv4-5256.tablet
+%%DATADIR%%/isdv4-526c.tablet
+%%DATADIR%%/isdv4-5276.tablet
+%%DATADIR%%/isdv4-5277.tablet
+%%DATADIR%%/isdv4-5278.tablet
+%%DATADIR%%/isdv4-5279.tablet
+%%DATADIR%%/isdv4-527a.tablet
+%%DATADIR%%/isdv4-527e.tablet
+%%DATADIR%%/isdv4-527f.tablet
+%%DATADIR%%/isdv4-5285.tablet
+%%DATADIR%%/isdv4-5286.tablet
+%%DATADIR%%/isdv4-528e.tablet
+%%DATADIR%%/isdv4-52a2.tablet
+%%DATADIR%%/isdv4-52b0.tablet
+%%DATADIR%%/isdv4-52d3.tablet
+%%DATADIR%%/isdv4-52d5.tablet
+%%DATADIR%%/isdv4-5309.tablet
 %%DATADIR%%/isdv4-90.tablet
 %%DATADIR%%/isdv4-93.tablet
 %%DATADIR%%/isdv4-e2.tablet
@@ -267,6 +493,7 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/isdv4-ec.tablet
 %%DATADIR%%/isdv4-ed.tablet
 %%DATADIR%%/isdv4-ef.tablet
+%%DATADIR%%/kamvas-pro-13.tablet
 %%DATADIR%%/layouts/bamboo-0fg-s-p-alt.svg
 %%DATADIR%%/layouts/bamboo-0fg-s-p.svg
 %%DATADIR%%/layouts/bamboo-16fg-m-pt.svg
@@ -293,6 +520,10 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/layouts/cintiq-companion-2.svg
 %%DATADIR%%/layouts/cintiq-companion-hybrid.svg
 %%DATADIR%%/layouts/cintiq-companion.svg
+%%DATADIR%%/layouts/cintiq-pro-16-2.svg
+%%DATADIR%%/layouts/cintiq-pro-17.svg
+%%DATADIR%%/layouts/cintiq-pro-22.svg
+%%DATADIR%%/layouts/cintiq-pro-27.svg
 %%DATADIR%%/layouts/dth-2242.svg
 %%DATADIR%%/layouts/dth-2452.svg
 %%DATADIR%%/layouts/dti-520.svg
@@ -302,13 +533,115 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/layouts/dtu-1141.svg
 %%DATADIR%%/layouts/dtu-1141b.svg
 %%DATADIR%%/layouts/ek-remote.svg
+%%DATADIR%%/layouts/gaomon-1060pro.svg
+%%DATADIR%%/layouts/gaomon-1061pro.svg
+%%DATADIR%%/layouts/gaomon-a1201.svg
+%%DATADIR%%/layouts/gaomon-a5h.svg
+%%DATADIR%%/layouts/gaomon-a5h_mt.svg
+%%DATADIR%%/layouts/gaomon-a601.svg
+%%DATADIR%%/layouts/gaomon-a801.svg
+%%DATADIR%%/layouts/gaomon-d16-pro.svg
+%%DATADIR%%/layouts/gaomon-g12.svg
+%%DATADIR%%/layouts/gaomon-g12gd.svg
+%%DATADIR%%/layouts/gaomon-g13.svg
+%%DATADIR%%/layouts/gaomon-g13gd.svg
+%%DATADIR%%/layouts/gaomon-g16.svg
+%%DATADIR%%/layouts/gaomon-g16gd.svg
+%%DATADIR%%/layouts/gaomon-g22.svg
+%%DATADIR%%/layouts/gaomon-gm116hd.svg
+%%DATADIR%%/layouts/gaomon-gm116hdtp.svg
+%%DATADIR%%/layouts/gaomon-gm156hd.svg
+%%DATADIR%%/layouts/gaomon-gm156hdtp.svg
+%%DATADIR%%/layouts/gaomon-gt-1106.svg
+%%DATADIR%%/layouts/gaomon-gt116h.svg
+%%DATADIR%%/layouts/gaomon-m0610-pro.svg
+%%DATADIR%%/layouts/gaomon-m10.svg
+%%DATADIR%%/layouts/gaomon-m106k-pro.svg
+%%DATADIR%%/layouts/gaomon-m106k.svg
+%%DATADIR%%/layouts/gaomon-m10k-2018.svg
+%%DATADIR%%/layouts/gaomon-m10k-pro.svg
+%%DATADIR%%/layouts/gaomon-m1220.svg
+%%DATADIR%%/layouts/gaomon-m1230.svg
+%%DATADIR%%/layouts/gaomon-m6.svg
+%%DATADIR%%/layouts/gaomon-m62022.svg
+%%DATADIR%%/layouts/gaomon-m7.svg
+%%DATADIR%%/layouts/gaomon-m8.svg
+%%DATADIR%%/layouts/gaomon-pd1161.svg
+%%DATADIR%%/layouts/gaomon-pd1161gd.svg
+%%DATADIR%%/layouts/gaomon-pd1560.svg
+%%DATADIR%%/layouts/gaomon-pd1561.svg
+%%DATADIR%%/layouts/gaomon-pd1561gd.svg
+%%DATADIR%%/layouts/gaomon-pd156pro.svg
+%%DATADIR%%/layouts/gaomon-pd156progd.svg
+%%DATADIR%%/layouts/gaomon-pd1610.svg
+%%DATADIR%%/layouts/gaomon-pd1611.svg
+%%DATADIR%%/layouts/gaomon-pd2200.svg
 %%DATADIR%%/layouts/gaomon-s620.svg
+%%DATADIR%%/layouts/gaomon-s630.svg
+%%DATADIR%%/layouts/gaomon-s830.svg
+%%DATADIR%%/layouts/gaomon-sn540-m5.svg
+%%DATADIR%%/layouts/gaomon-sp1603.svg
+%%DATADIR%%/layouts/gaomon-t01.svg
+%%DATADIR%%/layouts/gaomon-t02.svg
+%%DATADIR%%/layouts/gaomon-wh850.svg
+%%DATADIR%%/layouts/gaomon-wh851.svg
 %%DATADIR%%/layouts/graphire-wireless-8x6.svg
 %%DATADIR%%/layouts/graphire4-4x5.svg
 %%DATADIR%%/layouts/graphire4-6x8.svg
+%%DATADIR%%/layouts/huion-gc610-710.svg
+%%DATADIR%%/layouts/huion-h1060p.svg
 %%DATADIR%%/layouts/huion-h420.svg
 %%DATADIR%%/layouts/huion-h610-pro.svg
+%%DATADIR%%/layouts/huion-h640p.svg
+%%DATADIR%%/layouts/huion-h950p-igg.svg
+%%DATADIR%%/layouts/huion-h950p.svg
+%%DATADIR%%/layouts/huion-hc16.svg
+%%DATADIR%%/layouts/huion-hs610.svg
+%%DATADIR%%/layouts/huion-hs611.svg
+%%DATADIR%%/layouts/huion-hs64.svg
+%%DATADIR%%/layouts/huion-hs95.svg
+%%DATADIR%%/layouts/huion-hst640.svg
+%%DATADIR%%/layouts/huion-inspiroy-2-l---h1061p.svg
+%%DATADIR%%/layouts/huion-inspiroy-2-m---h951p.svg
+%%DATADIR%%/layouts/huion-inspiroy-2-s---h641p.svg
+%%DATADIR%%/layouts/huion-inspiroy-dial-2.svg
+%%DATADIR%%/layouts/huion-inspiroy-dial-q620m.svg
+%%DATADIR%%/layouts/huion-inspiroy-g10t.svg
+%%DATADIR%%/layouts/huion-inspiroy-giano.svg
+%%DATADIR%%/layouts/huion-inspiroy-h1161.svg
+%%DATADIR%%/layouts/huion-inspiroy-h430p.svg
+%%DATADIR%%/layouts/huion-inspiroy-h580x.svg
+%%DATADIR%%/layouts/huion-inspiroy-h610x.svg
+%%DATADIR%%/layouts/huion-inspiroy-ink-h320m.svg
+%%DATADIR%%/layouts/huion-inspiroy-keydial-kd200.svg
+%%DATADIR%%/layouts/huion-inspiroy-q11k-v2.svg
+%%DATADIR%%/layouts/huion-inspiroy-q11k.svg
+%%DATADIR%%/layouts/huion-inspiroy-q620m.svg
+%%DATADIR%%/layouts/huion-inspiroy-wh1409-v2.svg
+%%DATADIR%%/layouts/huion-kamvas-12-gs1161.svg
+%%DATADIR%%/layouts/huion-kamvas-13.svg
+%%DATADIR%%/layouts/huion-kamvas-16-gs1562.svg
+%%DATADIR%%/layouts/huion-kamvas-162019.svg
+%%DATADIR%%/layouts/huion-kamvas-gt-156-2021.svg
+%%DATADIR%%/layouts/huion-kamvas-gt-156hd-v2.svg
+%%DATADIR%%/layouts/huion-kamvas-gt-221-pro.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-12-gt-116.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-13-gt1302.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-16-gt-156.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-16-gt1602.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-20-gt-192.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-20-gt1901.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-22-gt-221.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-24.svg
+%%DATADIR%%/layouts/huion-kamvas-pro-studio-22.svg
+%%DATADIR%%/layouts/huion-mini-keydial-kd100.svg
 %%DATADIR%%/layouts/huion-new-1060-plus.svg
+%%DATADIR%%/layouts/huion-rds-160.svg
+%%DATADIR%%/layouts/huion-rte-100.svg
+%%DATADIR%%/layouts/huion-rtm-500.svg
+%%DATADIR%%/layouts/huion-rtp-700.svg
+%%DATADIR%%/layouts/huion-rts-300.svg
+%%DATADIR%%/layouts/huion-wh1409.svg
 %%DATADIR%%/layouts/intuos-m-p.svg
 %%DATADIR%%/layouts/intuos-m-p2.svg
 %%DATADIR%%/layouts/intuos-m-p3.svg
@@ -340,21 +673,61 @@ share/man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/layouts/intuos5-l.svg
 %%DATADIR%%/layouts/intuos5-m.svg
 %%DATADIR%%/layouts/intuos5-s.svg
+%%DATADIR%%/layouts/kamvas-pro-13.svg
 %%DATADIR%%/layouts/mobilestudio-pro-13.svg
 %%DATADIR%%/layouts/mobilestudio-pro-16.svg
+%%DATADIR%%/layouts/movink.svg
+%%DATADIR%%/layouts/xp-pen-artist10s.svg
+%%DATADIR%%/layouts/xp-pen-artist12.svg
+%%DATADIR%%/layouts/xp-pen-artist13-3-pro.svg
+%%DATADIR%%/layouts/xp-pen-deco-l.svg
+%%DATADIR%%/layouts/xp-pen-deco-mini4.svg
+%%DATADIR%%/layouts/xp-pen-deco-mw.svg
+%%DATADIR%%/layouts/xp-pen-deco-pro-s-m-sw-mw.svg
+%%DATADIR%%/layouts/xp-pen-deco01-v2.svg
 %%DATADIR%%/layouts/xp-pen-star03.svg
+%%DATADIR%%/lenovo-ideapad-duet.tablet
+%%DATADIR%%/letsketch-wp9620.tablet
 %%DATADIR%%/libwacom.stylus
 %%DATADIR%%/mobilestudio-pro-13-2.tablet
 %%DATADIR%%/mobilestudio-pro-13.tablet
 %%DATADIR%%/mobilestudio-pro-16-2.tablet
 %%DATADIR%%/mobilestudio-pro-16-3.tablet
 %%DATADIR%%/mobilestudio-pro-16.tablet
+%%DATADIR%%/movink.tablet
 %%DATADIR%%/n-trig-pen.tablet
 %%DATADIR%%/one-by-wacom-m-p.tablet
 %%DATADIR%%/one-by-wacom-m-p2.tablet
 %%DATADIR%%/one-by-wacom-s-p.tablet
 %%DATADIR%%/one-by-wacom-s-p2.tablet
 %%DATADIR%%/serial-wacf004.tablet
+%%DATADIR%%/surface-go-2.tablet
+%%DATADIR%%/surface-go.tablet
 %%DATADIR%%/volito-4x5.tablet
+%%DATADIR%%/wacom-hid-49a0-pen.tablet
+%%DATADIR%%/wacom-hid-52EB-pen.tablet
+%%DATADIR%%/wacom-hid-52fa-pen.tablet
+%%DATADIR%%/wacom-hid-5334-pen.tablet
+%%DATADIR%%/wacom-hid-5362.tablet
+%%DATADIR%%/wacom-one-12.tablet
+%%DATADIR%%/wacom-one-13.tablet
+%%DATADIR%%/wacom-one-pen-m.tablet
+%%DATADIR%%/wacom-one-pen-s.tablet
 %%DATADIR%%/wacom-one.tablet
+%%DATADIR%%/waltop-slim-tablet-12-1.tablet
+%%DATADIR%%/xp-pen-artist10s.tablet
+%%DATADIR%%/xp-pen-artist12.tablet
+%%DATADIR%%/xp-pen-artist13-3-pro.tablet
+%%DATADIR%%/xp-pen-deco-l.tablet
+%%DATADIR%%/xp-pen-deco-mini4.tablet
+%%DATADIR%%/xp-pen-deco-mini7.tablet
+%%DATADIR%%/xp-pen-deco-mw.tablet
+%%DATADIR%%/xp-pen-deco-pro-mw.tablet
+%%DATADIR%%/xp-pen-deco-pro-sw.tablet
+%%DATADIR%%/xp-pen-deco01-v2.tablet
+%%DATADIR%%/xp-pen-g430.tablet
+%%DATADIR%%/xp-pen-g430s.tablet
+%%DATADIR%%/xp-pen-g640.tablet
 %%DATADIR%%/xp-pen-star03.tablet
+share/man/man1/libwacom-list-devices.1.gz
+share/man/man1/libwacom-list-local-devices.1.gz