diff --git a/autoload/go/package.vim b/autoload/go/package.vim
index 9b5c64821a..4f756135a9 100644
--- a/autoload/go/package.vim
+++ b/autoload/go/package.vim
@@ -46,7 +46,7 @@ function! go#package#Paths()
         let dirs += [s:goroot]
     endif
 
-    let workspaces = split($GOPATH, go#util#PathListSep())
+    let workspaces = split(go#path#Detect(), go#util#PathListSep())
     if workspaces != []
         let dirs += workspaces
     endif