diff --git a/shell/_main.sh b/shell/_main.sh
index 077ab5d..a5218f5 100644
--- a/shell/_main.sh
+++ b/shell/_main.sh
@@ -30,6 +30,7 @@ source "$DOTSHELL/tmux.sh"
 source "$DOTSHELL/nodejs.sh"
 source "$DOTSHELL/python.sh"
 source "$DOTSHELL/ruby.sh"
+source "$DOTSHELL/golang.sh"
 source "$DOTSHELL/sbcl.sh"
 source "$DOTSHELL/amdsdk.sh"
 
diff --git a/shell/golang.sh b/shell/golang.sh
new file mode 100644
index 0000000..07ce7dc
--- /dev/null
+++ b/shell/golang.sh
@@ -0,0 +1,6 @@
+#
+# Go (golang) environment setup.
+#
+
+export GOPATH="$HOME/.go"
+path_append "$GOPATH/bin"