diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 67d6df6..8304936 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
+machine=$(hostname)
+
 ## Helper functions:
 
 # This simple function saves a lot of keystrokes when editing this
@@ -224,26 +226,21 @@ hc unlock
 
 herbstclient set tree_style '╾│ ├└╼─┐'
 
-## Monitors
-# I have two monitors, each with a resolution of 1920x1080.
-hc set_monitors 1920x1080+0+0
-
 # Pad the first monitor to make room for mowedline and trayer.
 hc pad 0 0 0 16 16
 
 # Load layouts for the dev and web tags.
-hc load dev '(split horizontal:0.580:1 (clients max:0) (clients vertical:0))'
 hc load web '(clients max:0)'
 
 # Make sure the "Emacs" frame is selected.
 hc focus_edge left
 
-# Lock each tag to its specific monitor.
-lock-tag-to-monitor dev 0
-lock-tag-to-monitor web 1
-
 ## Other configurations
 
+# Load a machine-specific configuration if it exists.
+[ -x "${HOME}/.config/herbstluftwm/machines/${machine}.sh" ] \
+    && source "${HOME}/.config/herbstluftwm/machines/${machine}.sh"
+
 # Load any other configuration files in
 # $HOME/.config/herbstluftwm/autostart.d so other programs can
 # configure parts of herbstluftwm to their needs (such as keybindings
diff --git a/herbstluftwm/.config/herbstluftwm/machines/data.sh b/herbstluftwm/.config/herbstluftwm/machines/data.sh
new file mode 100644
index 0000000..7e98a24
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/machines/data.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+## Monitors
+hc set_monitors 1920x1080+0+0
+
+hc load dev '(split horizontal:0.580:1 (clients max:0) (clients vertical:0))'
diff --git a/herbstluftwm/.config/herbstluftwm/machines/rincewind.sh b/herbstluftwm/.config/herbstluftwm/machines/rincewind.sh
new file mode 100755
index 0000000..27b262a
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/machines/rincewind.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env zsh
+
+## Monitors
+hc set_monitors 1920x1080+0+0 1200x1920+1920+0
+
+hc load dev '(split horizontal:0.535:1 (clients max:0) (clients vertical:0))'
+
+# Lock each tag to its specific monitor.
+lock-tag-to-monitor dev 0
+lock-tag-to-monitor web 0