diff --git a/Xresources b/Xresources.d/50_urxvt
similarity index 96%
rename from Xresources
rename to Xresources.d/50_urxvt
index 1ce8001..d835b20 100644
--- a/Xresources
+++ b/Xresources.d/50_urxvt
@@ -50,3 +50,5 @@ urxvt.modifier:   alt
 ! white
 *color7: #babdb6
 *color15: #d3d7cf
+
+! vim: set ft=xdefaults:
diff --git a/xinitrc b/xinitrc
index faaaedd..43584e0 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,12 +1,19 @@
+#!/bin/sh
+
 setxkbmap -option ctrl:nocaps
 xmodmap ~/.xmodmap
 xset mouse 5/0.1
 xsetroot -cursor_name arrow
 
-# .Xresources is managed by software (e.g. Puppet) whereas .Xresources-local
-# may contain any system-specific configuration
-xrdb -merge ~/.Xresources
-test -f ~/.Xresources-local && xrdb -merge ~/.Xresources-local
+# .Xresources will be included by convention, but .Xresources.d should be used
+# instead; the latter will override the former
+xrd="$HOME/.Xresources.d"
+test -f ~/.Xresources && xrdb -merge ~/.Xresources
+test -d "$xrd" && {
+  for xr in "$xrd"/*; do
+    xrdb -merge "$xr"
+  done
+}
 
 # .xprofile is *not* managed by software (such as Puppet) and may therefore
 # be used for system-specific configuration