diff --git a/download b/download
index b4cc34de66d8dc171409d5e864238abf114859f5..643ba5c91e1ea6d0543ac027023c786b9eccfed8 100644
--- a/download
+++ b/download
@@ -1,2 +1,2 @@
-32ba9785776b705da1d04d3f5d2bd024  go1.21.9-1-openssl-fips.tar.gz
-8350795cdf328920bdf298f4f7df67f9  go1.21.9.tar.gz
+993a52e59cf6abed3f22b9b3bdec93fa  go1.21.11-1-openssl-fips.tar.gz
+e2565abf7b78514cd163ba57455539e1  go1.21.11.tar.gz
diff --git a/golang.spec b/golang.spec
index 927fca868ce8f84ce95adfe6c49995b7bcadfae9..7a91680519b39d9f85c4cd1829764364b4f58dc5 100644
--- a/golang.spec
+++ b/golang.spec
@@ -96,7 +96,7 @@
 %endif
 
 %global go_api 1.21
-%global version 1.21.9
+%global version 1.21.11
 %global pkg_release 1
 
 Name:           golang
@@ -153,7 +153,6 @@ Patch1939923:   skip_test_rhbz1939923.patch
 
 Patch2:		disable_static_tests_part1.patch
 Patch3:		disable_static_tests_part2.patch
-Patch4:		skip-test-overlong-message.patch
 Patch5:		modify_go.env.patch
 
 # Having documentation separate was broken
@@ -251,9 +250,12 @@ Requires:       %{name} = %{version}-%{release}
 pushd ..
 tar -xf %{SOURCE1}
 popd
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
+patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
+# Add --no-backup-if-mismatch option to avoid creating .orig temp files
+for p in "$patch_dir"/*.patch; do
+       echo "Applying $p"
+      patch -p1 --no-backup-if-mismatch < $p
+done
 
 # Configure crypto tests
 pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@@ -538,10 +540,18 @@ cd ..
 %endif
 
 %changelog
-* Fri May 31 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 1.21.9-1.0.1
+* Mon Jul 15 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 1.21.11-1.0.1
 - disable DISABLE_BoringCertAlgs_TEST test
 - Add LoongArch64 support (limeidan@loongsonc.cn)
 
+* Wed Jun 12 2024 Archana Ravindar <aravinda@redhat.com> - 1.21.11-1
+- Update to Go1.21.11 to address CVE-2024-24789 and CVE-2024-24790
+- Resolves: RHEL-40274
+
+* Thu May 23 2024 David Benoit <dbenoit@redhat.com> - 1.21.10
+- Update to Go 1.21.10
+- Resolves: RHEL-36993
+
 * Fri Apr 12 2024 David Benoit <dbenoit@redhat.com> - 1.21.9-1
 - Fix CVE-2023-45288
 - Resolves: RHEL-31915
diff --git a/skip-test-overlong-message.patch b/skip-test-overlong-message.patch
deleted file mode 100644
index 1e143935a95f552d284085fe71609d9690bfa733..0000000000000000000000000000000000000000
--- a/skip-test-overlong-message.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
-index 0853178e3a..16eb37734b 100644
---- a/src/crypto/rsa/pkcs1v15_test.go
-+++ b/src/crypto/rsa/pkcs1v15_test.go
-@@ -247,6 +247,10 @@ func TestVerifyPKCS1v15(t *testing.T) {
- }
- 
- func TestOverlongMessagePKCS1v15(t *testing.T) {
-+	// OpenSSL now returns a random string instead of an error
-+	if boring.Enabled() {
-+		t.Skip("Not relevant in boring mode")
-+	}
- 	ciphertext := decodeBase64("fjOVdirUzFoLlukv80dBllMLjXythIf22feqPrNo0YoIjzyzyoMFiLjAc/Y4krkeZ11XFThIrEvw\nkRiZcCq5ng==")
- 	_, err := DecryptPKCS1v15(nil, rsaPrivateKey, ciphertext)
- 	if err == nil {