diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
index 899b8a4e05f..166a97acbe8 100644
--- a/var/spack/repos/builtin/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -82,10 +82,17 @@ def patch(self):
 
     def install(self, spec, prefix):
         bash = which('bash')
-        with working_dir('src'):
+
+        wd = '.'
+
+        # 1.11.5 directory structure is slightly different
+        if self.version == Version('1.11.5'):
+            wd = 'go'
+
+        with working_dir(join_path(wd, 'src')):
             bash('{0}.bash'.format('all' if self.run_tests else 'make'))
 
-        install_tree('.', prefix)
+        install_tree(wd, prefix)
 
     def setup_environment(self, spack_env, run_env):
         spack_env.set('GOROOT_FINAL', self.spec.prefix)