diff --git a/etc/X11/xorg.conf.d/00-keyboard.conf b/etc/X11/xorg.conf.d/00-keyboard.conf
new file mode 100644
index 00000000..fac7da60
--- /dev/null
+++ b/etc/X11/xorg.conf.d/00-keyboard.conf
@@ -0,0 +1,7 @@
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "fi"
+EndSection