diff --git a/bash/.bashrc b/bash/.bashrc
index 515a8af..1aefb00 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -6,7 +6,7 @@
 [[ $- != *i* ]] && return
 
 # Export our directory to Termite for opening new terminals
-if [[ $TERM == xterm-termite ]]; then
+if [[ "$TERM" == xterm-termite ]] || [[ "$TERM" == xterm ]]; then
   . /etc/profile.d/vte.sh
   __vte_prompt_command
 fi
diff --git a/shell/.profile b/shell/.profile
index 0ac5a7b..7de1ce7 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -45,6 +45,9 @@ if { [ -n "$BASH_VERSION" ] && shopt -q login_shell; } ||
 
     # Use my preferred pager settings for bat
     export BAT_PAGER="$PAGER $LESS"
+
+    # Fix terminal title which uses HOSTNAME instead of HOST
+    export HOSTNAME="$HOST"
 fi
 
 # Use keychain to handle ssh-agent, in interactive shell too
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b557d65..749632d 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,5 +1,5 @@
 # Export our directory to Termite for opening new terminals
-if [[ $TERM == xterm-termite ]]; then
+if [[ "$TERM" == xterm-termite ]] || [[ "$TERM" == xterm ]]; then
   . /etc/profile.d/vte.sh
   __vte_osc7
   precmd_functions+=(__vte_prompt_command) # FIXME: why isn't it set above ?