diff --git a/bashrc.d/go.bash b/bashrc.d/go.bash
new file mode 100644
index 0000000..3ff052d
--- /dev/null
+++ b/bashrc.d/go.bash
@@ -0,0 +1,5 @@
+GO=$(which go)
+if [ -n "$GO" ] ; then
+  export GOPATH=$(go env GOPATH)
+  addpath "$GOPATH/bin"
+fi
diff --git a/bashrc.d/pyenv.bash b/bashrc.d/pyenv.bash
new file mode 100644
index 0000000..78848c3
--- /dev/null
+++ b/bashrc.d/pyenv.bash
@@ -0,0 +1,5 @@
+export PYENV_ROOT="$HOME/.pyenv"
+if [ -d "$PYENV_ROOT" ] ; then
+  command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init -)"
+fi