diff --git a/bashrc b/bashrc
index 5c8d61b..a5ce52c 100644
--- a/bashrc
+++ b/bashrc
@@ -109,6 +109,13 @@ else
     . $SSH_AGENT_FILE
 fi
 
+
+if [ "$HOME2" != "" ] ; then
+    echo "Switched root, merging $HOME2/.Xauthority"
+    xauth merge $HOME2/.Xauthority
+fi
+
+# TODO Do with dropbox now...
 # Done the longer format so we catch dropbox instance, rather than stuff like
 # "links http://www.dropbox.com/"
 # DROPBOX_PID=$(ps -u paul | grep dropbox$ | awk '{print $1}')