-alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
-alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+if test -n "$XAUTHORITY"; then
+ alias su='sudo -E -s'
+else
+ alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
+ alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+fi