diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc
index 3335df5..20c4d36 100644
--- a/roles/home-cli/files/bashrc
+++ b/roles/home-cli/files/bashrc
@@ -112,7 +112,7 @@ then
 fi
 
 # Set up GOPATH.
-export GOPATH="$HOME/data/go"
+export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
 if [ -x "$HOME/opt/go/bin/go" ] || [ -x /usr/bin/go ] || [ -x /usr/local/bin/go ]
 then
 	if [ ! -d "$GOPATH" ]