diff --git a/.gitignore b/.gitignore
index 2a3b516..89ee6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,5 @@
 /go1.20.8-1-openssl-fips.tar.gz
 /go1.21.3-1-openssl-fips.tar.gz
 /go1.21.3.tar.gz
+/go1.21.4.tar.gz
+/go1.21.4-1-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 6b96d6f..e514ded 100644
--- a/golang.spec
+++ b/golang.spec
@@ -93,13 +93,13 @@
 %endif
 
 %global go_api 1.21
-%global go_version 1.21.3
+%global go_version 1.21.4
 %global version %{go_version}
 %global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        5%{?dist}
+Release:        1%{?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
@@ -526,6 +526,10 @@ cd ..
 %files -n go-toolset
 
 %changelog
+* Tue Nov 14 2023 Alejandro Sáez <asm@redhat.com> - 1.21.4-1
+- Rebase to Go 1.21.4
+- Resolves: RHEL-11871
+
 * Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-5
 - Don't change GOPROXY/GOSUMDB
 - Related: RHEL-12624
diff --git a/sources b/sources
index 7eb506d..6c0d410 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.21.3-1-openssl-fips.tar.gz) = 869cd8d20ecd2c81ca4ae184fd1f73c124ee479334a002bda2135cb60ce919b0185f203f9d78f08c9616b32339f588aec6f9bc609d458e29dedcdab13dc985d3
-SHA512 (go1.21.3.tar.gz) = ad7976c4d31237c7aad7c0323390387db9d6800bd060debcd421f16d3b734276a159d4795e7cb8d9bd1e39358512293a11f0a35b0199f7113f28d25a20e20b0f
+SHA512 (go1.21.4.tar.gz) = e4dda45bbd1714c3c0077074d5fe2ae748ef3e848def62ff01de1595ad74bee2c3a8a20f5afe6aa97db7a82ee17f90f3c96a77d40d89d09c17f3edcd9ca71dd1
+SHA512 (go1.21.4-1-openssl-fips.tar.gz) = 40d794fe7ea00233d0a4c9f0fe7e53b045f6279ebba1b183ef01c9961787a0d47c6c72213e00c2bb2fc5c47fc9ff352252c71a0e4703a5c548767a3aa9451de5