diff --git a/systemd/atuin-daemon.service b/systemd/atuin-daemon.service
new file mode 100644
index 00000000000..28ebf65a787
--- /dev/null
+++ b/systemd/atuin-daemon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=atuin shell history daemon
+Requires=atuin-daemon.socket
+
+[Service]
+ExecStart=atuin daemon
+
+[Install]
+Also=atuin-daemon.socket
+WantedBy=default.target
diff --git a/systemd/atuin-daemon.socket b/systemd/atuin-daemon.socket
new file mode 100644
index 00000000000..9bab34246f0
--- /dev/null
+++ b/systemd/atuin-daemon.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Unix socket activation for atuin shell history daemon
+
+[Socket]
+ListenStream=%t/atuin.socket
+SocketMode=0600
+
+[Install]
+WantedBy=sockets.target