diff --git a/bin/gvm-use b/bin/gvm-use
index 674b79d..6d21831 100755
--- a/bin/gvm-use
+++ b/bin/gvm-use
@@ -2,7 +2,8 @@
 
 if [[ $1 == "use" ]]; then
   if [[ -n $2 ]]; then
-    cp ~/.gvm/gos/go-$2/bin/* ~/.gvm/bin
+    rm ~/.gvm/gos/default
+    ln -sf ~/.gvm/gos/go-$2 ~/.gvm/gos/default
     echo "Now using version $2"
     exit 0
   else
diff --git a/scripts/gvm b/scripts/gvm
index 16677a2..e4b343b 100644
--- a/scripts/gvm
+++ b/scripts/gvm
@@ -1,2 +1,3 @@
 export GVM_VERSION=`cat ~/.gvm/VERSION`
-export PATH=$PATH:~/.gvm/bin
+export GOROOT=~/.gvm/gos/default
+export PATH=$PATH:~/.gvm/bin:~/.gvm/gos/default/bin