diff --git a/bash/ensure-ssh-agent b/bash/ensure-ssh-agent
index e6fc430..a653c26 100644
--- a/bash/ensure-ssh-agent
+++ b/bash/ensure-ssh-agent
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ENVFILE=~/.bash/ssh-agent.env
+ENVFILE="${XDG_RUNTIME_DIR:-$XDG_DATA_HOME}/ssh-agent.env"
 
 if [ -f $ENVFILE ] ; then
     . $ENVFILE > /dev/null
diff --git a/bashrc b/bashrc
index 9a829d2..338d38a 100644
--- a/bashrc
+++ b/bashrc
@@ -9,11 +9,11 @@ function source-file {
 }
 
 source-file /etc/bash_completion
+source-file ~/.bash/environment
 source-file ~/.bash/colors
 source-file ~/.bash/aliases
 source-file ~/.bash/functions
 source-file ~/.bash/path
-source-file ~/.bash/environment
 source-file ~/.bash/prompt
 source-file ~/.bash/ensure-ssh-agent
 source-file ~/.bash/completion