diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py
index 89e4cf4294..c6bdc62de0 100644
--- a/programming/language/go/actions.py
+++ b/programming/language/go/actions.py
@@ -46,6 +46,10 @@ def install():
 
     shelltools.system("cp -r misc  %s/usr/lib/go" % get.installDIR())
 
+    pisitools.insinto("/usr/lib/go", "go.env")
+    pisitools.insinto("/usr/lib/go", "VERSION")
+    pisitools.dosed("%s/usr/lib/go/go.env" % get.installDIR() , "auto", "local")
+
     #pisitools.removeDir("/usr/lib/go/pkg/bootstrap")
 
     # remove testdata, which hit cave fix-linkage
diff --git a/programming/language/go/pspec.xml b/programming/language/go/pspec.xml
index fc3473a363..a38e1d5604 100644
--- a/programming/language/go/pspec.xml
+++ b/programming/language/go/pspec.xml
@@ -13,10 +13,10 @@
         <IsA>app:console</IsA>
         <Summary>Compiler and tools for the Go programming language from Google</Summary>
         <Description>Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.</Description>
-        <Archive sha1sum="79a1571cc17e6a5ed8a3515456fad6d623978b7e" type="targz">https://github.com/golang/go/archive/refs/tags/go1.20.5.tar.gz</Archive>
+        <Archive sha1sum="e698c3781944d5549c79b9d76851dbfd83209aa7" type="targz">https://github.com/golang/go/archive/refs/tags/go1.21.1.tar.gz</Archive>
         <!--<Archive sha1sum="6ecdf5a03974462119c051a0d53f825c851ffdbe" type="tarbz2" target="go-go1.14.3">https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.13.6.tbz</Archive>-->
         <!-- for using as a bootstrap -->
-        <Archive sha1sum="aeab68fd5449b86dbda73d90def011abb64161dc" type="targz" target="go-go1.20.5">https://go.dev/dl/go1.20.5.linux-amd64.tar.gz</Archive>
+        <Archive sha1sum="527591b1de2c7a0a75922fda1af2ccdb93815c5b" type="targz" target="go-go1.21.1">https://go.dev/dl/go1.21.1.linux-amd64.tar.gz</Archive>
     </Source>
 
     <Package>
@@ -39,6 +39,13 @@
     </Package>
 
     <History>
+        <Update release="19">
+            <Date>2023-09-07</Date>
+            <Version>1.21.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="18">
             <Date>2023-06-08</Date>
             <Version>1.20.5</Version>