diff --git a/.gitignore b/.gitignore
index e0c070b..0337066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/go1.21.7-1-openssl-fips.tar.gz
-SOURCES/go1.21.7.tar.gz
+SOURCES/go1.21.9-1-openssl-fips.tar.gz
+SOURCES/go1.21.9.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index a2b3f8c..46a4cf1 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1,2 +1,2 @@
-95372ec41602b3cbe44e4697a8aee799b7fcc9b2 SOURCES/go1.21.7-1-openssl-fips.tar.gz
-1b5c56fdf9030baaa0601ca6f2cbd36ae02433d0 SOURCES/go1.21.7.tar.gz
+1162b641e8b23110eaab7496003585ea6c786158 SOURCES/go1.21.9-1-openssl-fips.tar.gz
+54c038c82c82ebe2ad4ee2d0a3d7c4d39809f59a SOURCES/go1.21.9.tar.gz
diff --git a/SOURCES/fix-memleak-rsa-ecdh.patch b/SOURCES/fix-memleak-setupRSA.patch
similarity index 100%
rename from SOURCES/fix-memleak-rsa-ecdh.patch
rename to SOURCES/fix-memleak-setupRSA.patch
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index c91325e..ce1c2fb 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -93,13 +93,13 @@
 %endif
 
 %global go_api 1.21
-%global go_version 1.21.7
+%global go_version 1.21.9
 %global version %{go_version}
 %global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -140,6 +140,7 @@ Requires:       diffutils
 
 # Proposed patch by jcajka https://golang.org/cl/86541
 Patch221:       fix_TestScript_list_std.patch
+Patch229:       fix-memleak-setupRSA.patch
 
 Patch1939923:   skip_test_rhbz1939923.patch
 
@@ -529,6 +530,17 @@ cd ..
 %files -n go-toolset
 
 %changelog
+* Mon Apr 15 2024 David Benoit <dbenoit@redhat.com> - 1.21.9-2
+- Rebuilt for z-stream
+- Related: RHEL-24312
+- Related: RHEL-28940
+
+* Fri Apr 5 2024 Archana Ravindar <aravinda@redhat.com> - 1.21.9-1
+- Fix CVE-2024-1394
+- Fix CVE-2023-45288
+- Resolves RHEL-24312
+- Resolves RHEL-28940
+
 * Fri Feb 09 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
 - Rebase to Go 1.21.7
 - Set GOTOOLCHAIN to local