diff --git a/MICROSOFT_REVISION b/MICROSOFT_REVISION
deleted file mode 100644
index d8263ee9860..00000000000
--- a/MICROSOFT_REVISION
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 89f6f0572a3..06e64096a77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-go1.21.0
\ No newline at end of file
+go1.21.1
\ No newline at end of file
diff --git a/go b/go
index c19c4c566c6..2c1e5b05fe3 160000
--- a/go
+++ b/go
@@ -1 +1 @@
-Subproject commit c19c4c566c63818dfd059b352e52c4710eecf14d
+Subproject commit 2c1e5b05fe39fc5e6c730dd60e82946b8e67c6ba
diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch
index fc142c53ae6..b01bddc8a43 100644
--- a/patches/0004-Add-OpenSSL-crypto-backend.patch
+++ b/patches/0004-Add-OpenSSL-crypto-backend.patch
@@ -43,7 +43,7 @@ Subject: [PATCH] Add OpenSSL crypto backend
  create mode 100644 src/internal/goexperiment/exp_opensslcrypto_on.go
 
 diff --git a/src/cmd/api/boring_test.go b/src/cmd/api/boring_test.go
-index a9ec6e6bfefb76..01765f01736ccb 100644
+index f0e3575637c62a..0e9aceeb832d3b 100644
 --- a/src/cmd/api/boring_test.go
 +++ b/src/cmd/api/boring_test.go
 @@ -2,7 +2,7 @@
@@ -53,13 +53,13 @@ index a9ec6e6bfefb76..01765f01736ccb 100644
 -//go:build boringcrypto
 +//go:build boringcrypto || goexperiment.opensslcrypto
  
- package api
+ package main
  
 diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index f148fb97b5f62d..a0525bf42e3c18 100644
+index 36a20e8b2a8d37..d3c2293cd9671e 100644
 --- a/src/cmd/dist/test.go
 +++ b/src/cmd/dist/test.go
-@@ -1178,12 +1178,11 @@ func (t *tester) registerCgoTests(heading string) {
+@@ -1204,12 +1204,11 @@ func (t *tester) registerCgoTests(heading string) {
  			// a C linker warning on Linux.
  			// in function `bio_ip_and_port_to_socket_and_addr':
  			// warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
@@ -106,10 +106,10 @@ index 4aaf46b5d0f0dc..e2ac54f96db1e8 100644
  
  go list -f '{{.Dir}}' vendor/golang.org/x/net/http2/hpack
 diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
-index 91e2d5149ce4da..63b92ba9b3d89a 100644
+index d9e5774b6021d1..6a433d2ec7d45f 100644
 --- a/src/cmd/link/internal/ld/lib.go
 +++ b/src/cmd/link/internal/ld/lib.go
-@@ -1146,6 +1146,7 @@ var hostobj []Hostobj
+@@ -1151,6 +1151,7 @@ var hostobj []Hostobj
  // These packages can use internal linking mode.
  // Others trigger external mode.
  var internalpkg = []string{
@@ -602,7 +602,7 @@ index e474b8be318c84..ee90dede95cd4d 100644
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
  golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index 4e4c0fa9f11f5b..7d32c7c63795d6 100644
+index f213bd91903a71..b494e234d1fe1e 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
 @@ -425,6 +425,8 @@ var depsRules = `
diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch
index 6b47101a314..95425c48900 100644
--- a/patches/0005-Add-CNG-crypto-backend.patch
+++ b/patches/0005-Add-CNG-crypto-backend.patch
@@ -55,7 +55,7 @@ Subject: [PATCH] Add CNG crypto backend
  create mode 100644 src/internal/goexperiment/exp_cngcrypto_on.go
 
 diff --git a/src/cmd/api/boring_test.go b/src/cmd/api/boring_test.go
-index 01765f01736ccb..7598da96946b9f 100644
+index 0e9aceeb832d3b..aecf81b09c8ad3 100644
 --- a/src/cmd/api/boring_test.go
 +++ b/src/cmd/api/boring_test.go
 @@ -2,7 +2,7 @@
@@ -65,7 +65,7 @@ index 01765f01736ccb..7598da96946b9f 100644
 -//go:build boringcrypto || goexperiment.opensslcrypto
 +//go:build boringcrypto || goexperiment.opensslcrypto || goexperiment.cngcrypto
  
- package api
+ package main
  
 diff --git a/src/cmd/go/go_boring_test.go b/src/cmd/go/go_boring_test.go
 index 5376227f74cfaa..492ccf79d66b45 100644
@@ -1048,7 +1048,7 @@ index ee90dede95cd4d..88246d9a2e2442 100644
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
  golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index 7d32c7c63795d6..6146e20c7b027e 100644
+index b494e234d1fe1e..dc92957a4ff1a1 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
 @@ -425,6 +425,10 @@ var depsRules = `