diff --git a/Xresources.d/50_xscreensaver b/Xresources.d/50_xscreensaver
new file mode 100644
index 0000000..f818e8f
--- /dev/null
+++ b/Xresources.d/50_xscreensaver
@@ -0,0 +1,28 @@
+! xscreensaver configuration
+!
+! This is favored over ~/.xscreensaver because these settings are easily
+! overridden, especially with the Xresources.d system.
+
+xscreensaver.splash: false
+xscreensaver.mode: blank
+
+xscreensaver.timeout: 0:01:00
+xscreensaver.fade: true
+xscreensaver.unfade: false
+xscreensaver.lock: true
+xscreensaver.lockTimeout: 0:00:05
+xscreensaver.passwdTimeout: 0:00:03
+
+xscreensaver.dpmsEnabled: true
+xscreensaver.dpmsQuickOff: false
+xscreensaver.dpmsStandby: 0:05:00
+xscreensaver.dpmsStandby: 0:10:00
+xscreensaver.dpmsOff: 0:30:00
+
+xscreensaver.timestamp: true
+xscreensaver.verbose: false
+xscreensaver.captureStderr: true
+
+xscreensaver.pointerHysteresis: 10
+
+! vim: set ft=xdefaults:
diff --git a/xscreensaver b/xscreensaver
deleted file mode 100644
index ec928fb..0000000
--- a/xscreensaver
+++ /dev/null
@@ -1,22 +0,0 @@
-
-splash: false
-mode: blank
-
-timeout: 0:01:00
-fade: true
-unfade: false
-lock: true
-lockTimeout: 0:00:05
-passwdTimeout: 0:00:03
-
-dpmsEnabled: true
-dpmsQuickOff: false
-dpmsStandby: 0:05:00
-dpmsStandby: 0:10:00
-dpmsOff: 0:30:00
-
-timestamp: true
-verbose: false
-captureStderr: true
-
-pointerHysteresis: 10