diff --git a/contrib/fedora-default-kernel/README.md b/contrib/fedora-default-kernel/README.md
new file mode 100644
index 000000000..68dfe71bf
--- /dev/null
+++ b/contrib/fedora-default-kernel/README.md
@@ -0,0 +1,17 @@
+# Fedora Default Kernel Updater
+
+This is a small systemd service and path unit that makes sure that the linux-surface kernel is
+always booted by default on Fedora.
+
+The out of the box behaviour is that the newest kernel will be booted by default. This means that
+if the default kernel is ahead of the surface kernel, you have to go into GRUB and change the
+selection every time.
+
+## Installation
+
+```bash
+$ sudo dnf install /usr/sbin/grubby
+$ sudo cp default-kernel.{path,service} /etc/systemd/system/
+$ sudo systemctl daemon-reload
+$ sudo systemctl enable --now default-kernel.path
+```
diff --git a/contrib/fedora-default-kernel/default-kernel.path b/contrib/fedora-default-kernel/default-kernel.path
new file mode 100644
index 000000000..8c13d1e83
--- /dev/null
+++ b/contrib/fedora-default-kernel/default-kernel.path
@@ -0,0 +1,8 @@
+[Unit]
+Description=linux-surface default kernel watchdog
+
+[Path]
+PathChanged=/boot
+
+[Install]
+WantedBy=default.target
diff --git a/contrib/fedora-default-kernel/default-kernel.service b/contrib/fedora-default-kernel/default-kernel.service
new file mode 100644
index 000000000..e809019f3
--- /dev/null
+++ b/contrib/fedora-default-kernel/default-kernel.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=linux-surface default kernel watchdog
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "grubby --set-default /boot/vmlinuz*surface*"