diff --git a/config/herbstluftwm/autostart b/config/herbstluftwm/autostart
index 4547f57..28a6030 100755
--- a/config/herbstluftwm/autostart
+++ b/config/herbstluftwm/autostart
@@ -63,14 +63,23 @@ hc keybind $Mod-Control-Up      resize up +$resizestep
 hc keybind $Mod-Control-Right   resize right +$resizestep
 
 # custom keybindings
-hc keybind $Mod-grave spawn "$HOME"/.config/herbstluftwm/q3terminal.sh 9
+case "$HOSTNAME" in
+	fau*)
+		hc keybind $Mod-q spawn /usr/bin/xlock -geometry 1920x2
+		;;
+	*)
+		hc keybind $Mod-q spawn /usr/bin/i3lock
+		;;
+esac
+
 if [ "$HOSTNAME" = warthog ]; then
 	hc keybind $Mod-d spawn /usr/bin/dmenu_run -fn "Monospace-9"
 else
 	hc keybind $Mod-d spawn /usr/bin/dmenu_run
 fi
-hc keybind $Mod-q spawn /usr/bin/i3lock
+
 hc keybind $Mod-b spawn /usr/bin/chromium
+hc keybind $Mod-grave spawn "$HOME"/.config/herbstluftwm/q3terminal.sh 9
 
 hc keybind XF86AudioMute chain . spawn amixer -q set Master toggle . spawn herbstclient emit_hook UPDATE
 hc keybind XF86AudioLowerVolume and . spawn amixer -q set Master playback '5%-' . spawn herbstclient emit_hook UPDATE