--- a/system.bashrc
+++ b/system.bashrc
@@ -17,12 +17,8 @@
 
 export PS1 PS2 PS3 PS4
 
-if test "$TERM" = "xterm" -o \
-        "$TERM" = "xterm-color" -o \
-        "$TERM" = "xterm-256color" -o \
-        "$TERM" = "rxvt" -o \
-        "$TERM" = "rxvt-unicode" -o \
-        "$TERM" = "xterm-xfree86"; then
+if [[ "$TERM" == [xE]term* ]] ||
+   [[ "$TERM" == rxvt* ]]; then
     PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
     export PROMPT_COMMAND
 fi