diff --git a/CHANGELOG.md b/CHANGELOG.md
index 349a54c..e115203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## HEAD
 
+- Add xscreensaver-lock service.
 - Remove slimlock service.
 
 ## 1.2.0
diff --git a/system/xscreensaver-lock@.service b/system/xscreensaver-lock@.service
new file mode 100644
index 0000000..c7a04c4
--- /dev/null
+++ b/system/xscreensaver-lock@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lock X session using xscreensaver for user %i
+Documentation=man:xscreensaver(1)
+Before=sleep.target
+
+[Service]
+User=%i
+Type=oneshot
+ExecStart=/usr/bin/xscreensaver-command --lock
+
+[Install]
+WantedBy=sleep.target