diff --git a/debian/system76-coreboot-dkms.install b/debian/system76-coreboot-dkms.install
index 336a893..a040ca3 100644
--- a/debian/system76-coreboot-dkms.install
+++ b/debian/system76-coreboot-dkms.install
@@ -1 +1,2 @@
+lib/udev/hwdb.d
 usr/share/initramfs-tools
diff --git a/lib/udev/hwdb.d/99-system76-coreboot-dkms.hwdb b/lib/udev/hwdb.d/99-system76-coreboot-dkms.hwdb
new file mode 100644
index 0000000..0460d08
--- /dev/null
+++ b/lib/udev/hwdb.d/99-system76-coreboot-dkms.hwdb
@@ -0,0 +1,3 @@
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnSystem76*:pn*
+ KEYBOARD_KEY_f7=f21
+ KEYBOARD_KEY_f8=f21
diff --git a/system76-coreboot.c b/system76-coreboot.c
index 9515cdf..a316f2e 100644
--- a/system76-coreboot.c
+++ b/system76-coreboot.c
@@ -105,9 +105,7 @@ static void system76_key(struct system76_data * data, unsigned int code) {
 static void system76_notify(struct acpi_device *acpi_dev, u32 event) {
 	struct system76_data * data = acpi_driver_data(acpi_dev);
 
-	if (event == KEY_TOUCHPAD_TOGGLE) {
-		system76_key(data, KEY_TOUCHPAD_TOGGLE);
-	} else if (event == KEY_KBDILLUMTOGGLE) {
+	if (event == 0x80) {
 		// Keyboard LED change
 		enum led_brightness value = kb_led_get(&data->kb_led);
 		led_classdev_notify_brightness_hw_changed(&data->kb_led, value);