--- a/i3-sensible-terminal.O	2011-11-11 22:03:52.414218386 +0000
+++ b/i3-sensible-terminal	2011-11-11 22:04:38.372020210 +0000
@@ -1,13 +1,11 @@
 #!/bin/sh
 # This script tries to exec a terminal emulator by trying some known terminal
 # emulators.
-#
-# Distributions/packagers should enhance this script with a
-# distribution-specific mechanism to find the preferred terminal emulator. On
-# Debian, there is the x-terminal-emulator symlink for example.
-# Please don't touch the first line, though:
 which $TERMINAL >/dev/null && exec $TERMINAL "$@"
 
+# Debian-specific: use x-terminal-emulator
+which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
+
 # Hopefully one of these is installed:
 which xterm >/dev/null && exec xterm "$@"
 which urxvt >/dev/null && exec urxvt "$@"