diff --git a/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch b/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch
index ed0e1d3..52b296b 100644
--- a/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From ca5c3616a3c77b234e35ef953569b0da71084347 Mon Sep 17 00:00:00 2001
+From 808f74da665bb932664b4950fe86e05910c77537 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/16] Add support for BUS_VIRTUAL
@@ -20,10 +20,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 804ac3d..96aaa5e 100644
+index 2c17e0d..090d5aa 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -128,6 +128,8 @@ bus_from_str (const char *str)
+@@ -130,6 +130,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
  	if (g_str_equal(str, "i2c"))
  		return WBUSTYPE_I2C;
@@ -32,7 +32,7 @@ index 804ac3d..96aaa5e 100644
  	return WBUSTYPE_UNKNOWN;
  }
  
-@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus)
+@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
  		return "bluetooth";
  	case WBUSTYPE_I2C:
  		return "i2c";
@@ -42,10 +42,10 @@ index 804ac3d..96aaa5e 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index ccfe43a..d9b8a22 100644
+index d220d14..1ba0740 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
  		break;
@@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644
  	}
  
  out:
-@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -826,6 +830,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_USB:		bus_name = "usb";	break;
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
@@ -65,7 +65,7 @@ index ccfe43a..d9b8a22 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index cafed64..b184ed7 100644
+index 389681d..040c51e 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -149,6 +149,7 @@ typedef enum {
@@ -77,7 +77,7 @@ index cafed64..b184ed7 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 2095089..da5fe07 100644
+index 4b7983d..91e83de 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
 @@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -89,7 +89,7 @@ index 2095089..da5fe07 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index c2db899..476aeca 100755
+index 4cca787..8ab1fea 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -46,6 +46,7 @@ def test_device_match(tabletfile):
@@ -101,5 +101,5 @@ index c2db899..476aeca 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch b/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 12ba889..cd5a87b 100644
--- a/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From e2514eca67211f37574b1ef9c227c8f90b66e565 Mon Sep 17 00:00:00 2001
+From ff253e558ddc2cafed7ba1cf2bd93e3544debb30 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/16] Add support for Intel Management Engine bus
@@ -15,10 +15,10 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 96aaa5e..cc3ecfd 100644
+index 090d5aa..5a749c9 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -130,6 +130,8 @@ bus_from_str (const char *str)
+@@ -132,6 +132,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
  	if (g_str_equal(str, "virt"))
  		return WBUSTYPE_VIRTUAL;
@@ -27,7 +27,7 @@ index 96aaa5e..cc3ecfd 100644
  	return WBUSTYPE_UNKNOWN;
  }
  
-@@ -150,6 +152,8 @@ bus_to_str (WacomBusType bus)
+@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus)
  		return "i2c";
  	case WBUSTYPE_VIRTUAL:
  		return "virt";
@@ -37,10 +37,10 @@ index 96aaa5e..cc3ecfd 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index d9b8a22..e3364f4 100644
+index 1ba0740..1de4dc3 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -152,6 +152,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
@@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644
  	}
  
  out:
-@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -831,6 +835,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
  		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
@@ -60,7 +60,7 @@ index d9b8a22..e3364f4 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index b184ed7..5cd6736 100644
+index 040c51e..a937c08 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -150,6 +150,7 @@ typedef enum {
@@ -72,7 +72,7 @@ index b184ed7..5cd6736 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index da5fe07..6b45597 100644
+index 91e83de..9c8af44 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
 @@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -84,7 +84,7 @@ index da5fe07..6b45597 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 476aeca..cc739dd 100755
+index 8ab1fea..a3f1d9d 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -47,6 +47,7 @@ def test_device_match(tabletfile):
@@ -96,5 +96,5 @@ index 476aeca..cc739dd 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch b/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
index 474dd4e..6f34cb3 100644
--- a/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
+++ b/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,4 +1,4 @@
-From ea2503e14cbec0ce0402768ac1ad831625fda2a6 Mon Sep 17 00:00:00 2001
+From b2cd1fd0ecd63b4cb78de9111333e5ebd7ce8be6 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
 Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch b/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
index f62fa2a..f794c65 100644
--- a/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From 82bedd51116db60bd2f033ce6962e78ad85cdbc6 Mon Sep 17 00:00:00 2001
+From 22d88608f2d8275c7903e99bbf6adb25917444b7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 04/16] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch b/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
index 27af194..6da96e4 100644
--- a/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From 0bb846deb7e80cdf58d24b36818d0f53d9230350 Mon Sep 17 00:00:00 2001
+From 817645f017e59fd6c52b055f6a84964bc2eb7ece Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 05/16] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch b/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
index fde6973..4523b98 100644
--- a/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From 3d86a63e2b2f8a83cdab5780590eb028dbd062d6 Mon Sep 17 00:00:00 2001
+From e220b3f08175713b573ae6442d1a78bd9d736523 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 06/16] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
index 766554e..7c1d6fb 100644
--- a/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 863d8d86d360c84e0fdd4d4b7deab5dd491e35aa Mon Sep 17 00:00:00 2001
+From 4ca473d97213ba21b44d802a97c08e6d1d5fa313 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 07/16] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
index f82235e..1c493a5 100644
--- a/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 3e7603439f3c43b43a5ffb205240c4aee288925f Mon Sep 17 00:00:00 2001
+From 9b63f2d4a734c5939d79d3647b6f7b786aeb6be1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 May 2023 12:32:21 +0200
 Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+
@@ -30,5 +30,5 @@ index 0000000..36e1e3f
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch b/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
index 2dbf3e4..a04a22c 100644
--- a/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
+++ b/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
@@ -1,4 +1,4 @@
-From bbb911a4dd661920b19fe7ac93a34a1251039092 Mon Sep 17 00:00:00 2001
+From ed65256b6fe211840687af577c2e79961ba9827b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 11 Jun 2023 21:29:52 +0200
 Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8
@@ -30,5 +30,5 @@ index 0000000..fe779af
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch b/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
index 6384885..671556e 100644
--- a/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
+++ b/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
@@ -1,4 +1,4 @@
-From bf6c55ab5bcd46c418a4a2ad0a0312e28b70e5e3 Mon Sep 17 00:00:00 2001
+From 9c11b480b22f200ace8fb3d67c48932a85938277 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 14 Jun 2023 21:11:36 +0200
 Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9
@@ -30,5 +30,5 @@ index 0000000..e5ccf68
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch b/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch
index 65904a4..e149d7a 100644
--- a/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch
+++ b/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 9c4344dffb1e06d81113eba3603f4c38457ceb44 Mon Sep 17 00:00:00 2001
+From be3ea124cbd482f4b4f7082f05cd96bbcf031acf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 11/16] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch b/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 97b607a..7e8b1c1 100644
--- a/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From a5fd9e35dd06a300a2f50e4cb8724793331b5a47 Mon Sep 17 00:00:00 2001
+From 13159050c79d2fa615a5558457fe716c71628278 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch b/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
index ada8021..99491ac 100644
--- a/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 6cd78337204a31c3479d077a78d2bd4c469c58bd Mon Sep 17 00:00:00 2001
+From 55cefd38d6b74fe822ef2e18fc0cc8d97f21679a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch b/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
index 5ab36ed..6fd7af1 100644
--- a/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From ae98349af0b3a0a7ca2a7676f29d81a8d960bfe1 Mon Sep 17 00:00:00 2001
+From 4dbf2e50785b775ce18473b990810d162d27ab80 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch b/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
index e0c099d..3ba855f 100644
--- a/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From f776cf5680942e0a03b1c6023851086fa0229a6c Mon Sep 17 00:00:00 2001
+From 4a47f0eef0e3d7bb44b3b34f85e25d5b7e4ccc07 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
index 6ac0813..a173115 100644
--- a/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
+++ b/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
@@ -1,4 +1,4 @@
-From 33da22c5f8639c13d152c749cf71339d9caac622 Mon Sep 17 00:00:00 2001
+From 8603173ac0a99578e1e7ed18f0864d002f6a2500 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 14 Jun 2023 21:12:41 +0200
 Subject: [PATCH 16/16] data: Add Microsoft Surface Laptop Studio
@@ -30,5 +30,5 @@ index 0000000..6739b2c
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/pkg/debian/PKGBUILD b/pkg/debian/PKGBUILD
index 1f4335c..b8f230b 100644
--- a/pkg/debian/PKGBUILD
+++ b/pkg/debian/PKGBUILD
@@ -10,9 +10,9 @@ pkgname=(
     libwacom-surface
 )
 _pkgver1=1.12.1
-_pkgver2=2.8.0
-pkgver=2.8.0
-pkgrel=2
+_pkgver2=2.9.0
+pkgver=2.9.0
+pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('amd64')
 url="https://github.com/linux-surface/libwacom"
@@ -23,6 +23,7 @@ makedepends=(
     'libglib2.0-dev'
     'libgudev-1.0-dev'
     'libxml2-dev'
+    'libevdev-dev'
     'udev'
 )
 checkdepends=(
@@ -73,7 +74,7 @@ source=(
 )
 sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'SKIP'
-            'bb04b12c8688d0ff6a108d47a38d2057d572c4d7227d78138abd5fd0ba59f215'
+            '6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242'
             'SKIP'
             'c504893656f851832116616e6e5bd50b3d0ac36f7288042dc7eb50e396212bc4'
             'c64275d8129ed21c58442cda159c90bea6e97813ee91e3911344dd0760a6f35c'
@@ -91,22 +92,22 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             '3113ca84ad91f05a5c7f5076e3802ed6c8cd3805ea6bb8cd60c44d0cfe234ced'
             '554b6f6bd1f283094daf8911dfc288b4f88f3ae9e63cd450bb24fef89fc07d5a'
             'e780cf1f85edb37a675109574873d671ccc4e9bbac191e8f9685a4a1a79ced0c'
-            '0e00ada152317d16355cbfed8195397f3903f3d3448d19731d839367182d4cb6'
-            'a092cc857a665204fc0284865186fddc7e746f0e4217f1c55a128265929e101f'
-            '7380090427e166e2216742479925c44045cf914e3543615692850168d952f0c8'
-            '33e4867394903376f110b674cc0a0b777313dfb4c7ff3a487e11e3735b95c604'
-            '94903d479d0667870decdd57c51bee29d16feb199dc720844144e13745d77877'
-            'f70a3faf5797b3db86c51fd2bf75a3f7fb95087231e8c998b3ce5b8a009f08da'
-            '93931117dccec37684b8890e5ae28ac6c23e65517581e0269382252c81eeab2b'
-            '57abca80d9be9e4d93d5ba83be92a576d0fef5186efcbb213c92cb5fa85e8b5f'
-            '6886bd9f9a445830972d608f3edcd8381527c6ac553fcb4511559a2274ab4904'
-            '7096f0e8d5b57c5e20e0616be98b77f6f5d300d7913d2e224f8a2b968872765d'
-            'a61577739761a0730ed137cbd4c1151275ecabece7b9c35069e8de7fcf2786bc'
-            '16e4c0124cf126735c321f5b2fd51d303f079a8892727981b2221a36a7d93c8f'
-            'fe511c7ff2b39760aaee0617cedd7277cca4c49627fc476006bfb30bdd4bb35f'
-            '5c4acfc9565d7743686792e6637e28a54f28abd9ab5a05bda072e34fab7f5af7'
-            '227c278f19be81d8cd67556855b0e4e7bc0fd3059f9697b525506be2b076cfa9'
-            '79a11214181e0e912e77e9013c7f35f7a44fc2f839d331371a227e1563985151')
+            '7db8188ca1afd8655fd79b606428e403baefdec13484d4807ace4b992bed6807'
+            '5ec7cf7f5e0a4e0278563cb05e6a446c3a26ca82cd2e2a6c129d5d8cc35828e5'
+            'f14740304f43c336bdf7e1d78991717b504331f48c577d2c512ae276981c8f1e'
+            '649bfef25ae14d9cc44818ad466f1bcfab56b890acfbdbddd5f8a546cbfecebb'
+            'd54044d69ee002d891e554149d350462618329477d0e1900528c34973bcb315e'
+            '634e552757df946f997f0f682802828f6540b5eff9eb60965714e4c9a8c3a3f5'
+            'b3d7197f92d7e02e73b2f06a0b7770164f5052d38afa36843099468dd5eafafa'
+            'bd8ae40ec5e3214fab8a92861a1e07ba92c89aebd2ecfbe59f2649a92150d1fb'
+            '9dee7840ac3231adbd5c23c57a09a289e3cc3fe4a24fcb2c56e78ab2c86f86cd'
+            '101e8ba35a6493359667a3c119e6f792bde16e77c04642127e7dd81bc2d56d41'
+            '0b38005851833200cf31a4bc99a4bac40a560db14bf32f4c4ebcfe77f635e06b'
+            'f1236857310a8362abb8fc55e67a7013b61f03d593a89acf6ceae86cefc4ec37'
+            '5da915726aba84add16f5c509dc1be343db66f70a294b411759353b0ffaef0c2'
+            '8bb8c1aab143185a05b91cacaf600e147fcee55fc1abe67af0e1d6fed0b6e99f'
+            'bd6c8a319845ec161106b85859ab42b22ded1f6515676449a00bb3cc776acb43'
+            'bc4398d29b3a49e617cb7d9acd7a045c2a8c248c2065c96fd38ecc59e1a6d86f')
 
 prepare() {
     msg2 "patching libwacom-${_pkgver1}"
diff --git a/pkg/fedora/libwacom-surface.spec b/pkg/fedora/libwacom-surface.spec
index d16af99..b0287e6 100644
--- a/pkg/fedora/libwacom-surface.spec
+++ b/pkg/fedora/libwacom-surface.spec
@@ -1,20 +1,20 @@
 %global debug_package %{nil}
 
 Name:           libwacom-surface
-Version:        2.8.0
-Release:        2%{?dist}
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 Provides:       libwacom
 Conflicts:      libwacom
 
-License:        MIT
+License:        HPND
 URL:            https://github.com/linuxwacom/libwacom
 
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.xz
 
 BuildRequires:  meson gcc
-BuildRequires:  glib2-devel libgudev1-devel
+BuildRequires:  glib2-devel libgudev1-devel libevdev-devel
 BuildRequires:  systemd systemd-devel
 BuildRequires:  git-core
 BuildRequires:  libxml2-devel
@@ -45,6 +45,16 @@ Conflicts:      libwacom-data
 %description data
 Tablet information client library data files.
 
+%package utils
+Summary:        Tablet Information Client Library Utilities Package
+Requires:       %{name} = %{version}-%{release}
+Requires:       python3-libevdev python3-pyudev
+Provides:       libwacom-utils
+Conflicts:      libwacom-utils
+
+%description utils
+Utilities to handle and/or debug libwacom devices.
+
 %prep
 %autosetup -S git -n libwacom-%{version}
 for p in ../libwacom-surface/v2/*.patch; do
@@ -69,12 +79,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %license COPYING
 %doc README.md
 %{_libdir}/libwacom.so.*
-%{_bindir}/libwacom-list-devices
 %{_bindir}/libwacom-list-local-devices
-%{_bindir}/libwacom-show-stylus
 %{_bindir}/libwacom-update-db
 
-%{_mandir}/man1/libwacom-list-devices.1*
 %{_mandir}/man1/libwacom-list-local-devices.1*
 
 %files devel
@@ -94,18 +101,66 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %dir %{_datadir}/libwacom/layouts
 %{_datadir}/libwacom/layouts/*.svg
 
+%files utils
+%{_bindir}/libwacom-list-devices
+%{_bindir}/libwacom-show-stylus
+%{_mandir}/man1/libwacom-list-devices.1*
+
 %changelog
-* Tue Jun 21 2022 Maximilian Luz <luzmaximilian@gmail.com> - 2.3.0-1
+* Wed Dec 13 2023 Maximilian Luz <luzmaximilian@gmail.com> - 2.9.0-1
+- libwacom 2.9.0 surface
+
+* Mon Nov 27 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.9.0-1
+- libwacom 2.9.0
+
+* Tue Sep 05 2023 Peter Hutterer <peter.hutterer@redhat.com>
+- SPDX migration: update to SPDX identifiers.
+  Turns out the COPYING file references the HPND, not MIT.
+
+* Thu Aug 31 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.8.0-1
+- libwacom 2.8.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed May 17 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.7.0-1
+- libwacom 2.7.0
+
+* Mon Jan 23 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.6.0-1
+- libwacom 2.6.0
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 28 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.4.0-1
+- libwacom 2.4.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 20 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.3.0-1
 - libwacom 2.3.0
 
-* Thu Apr 28 2022 Maximilian Luz <luzmaximilian@gmail.com> - 2.2.0-2
-- Re-add accidentally dropped tablet data for Surface Pro 3
+* Fri Mar 25 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.2.0-1
+- libwacom 2.2.0
+
+* Fri Feb 11 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.1.0-1
+- libwacom 2.1.0
 
-* Thu Apr 28 2022 Maximilian Luz <luzmaximilian@gmail.com> - 2.2.0-1
-- Add support for libwacom-2.x
+* Mon Jan 31 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.0.0-3
+- Split utilities into a separate package (#2047568)
+  libwacom-list-local-devices is the most commonly used one so let's leave
+  that in the main package, the others are for debugging so let's move them
+  out.
 
-* Mon Jan 17 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.12.1-1
-- libwacom 1.12.1
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 17 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.0.0-1
+- libwacom 2.0.0
+
+* Mon Dec 13 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.99.1-1
+- libwacom 1.99.1
 
 * Wed Sep 01 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.12-1
 - libwacom 1.12
@@ -155,6 +210,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 * Tue Aug 18 2020 Maximilian Luz <luzmaximilian@gmail.com> 1.4.1-2
 - add iptsd support
 
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jun 30 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4.1-1
 - libwacom 1.4.1