diff --git a/var/spack/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
similarity index 93%
rename from var/spack/packages/go/package.py
rename to var/spack/repos/builtin/packages/go/package.py
index 4e3f6fa8ec9..05fce905341 100644
--- a/var/spack/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -10,9 +10,10 @@ class Go(Package):
 
     # temporary fix until tags are pulled correctly
     version('1.4.2', git='https://go.googlesource.com/go', tag='go1.4.2')
+    version('1.5.0', git='https://go.googlesource.com/go', tag='go1.5.0')
 
     # to-do, make non-c self-hosting compilers possible
-    # depends_on('go@:1.4.2', when='@1.5:')
+    depends_on('go@:1.4.2', when='@1.5:')
 
     def install(self, spec, prefix):
       os.environ['GOROOT'] = os.getcwd()
diff --git a/var/spack/packages/the_platinum_searcher/package.py b/var/spack/repos/builtin/packages/the_platinum_searcher/package.py
similarity index 100%
rename from var/spack/packages/the_platinum_searcher/package.py
rename to var/spack/repos/builtin/packages/the_platinum_searcher/package.py