diff --git a/.gitignore b/.gitignore
index a29663e..a79337d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ SOURCES/go1.19.4.tar.gz
 /go1.19.6.tar.gz
 /go1.20.3.tar.gz
 /go1.20.3-1-openssl-fips.tar.gz
+/go1.20.4.tar.gz
+/go1.20.4-3-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 52f149c..11bbe09 100644
--- a/golang.spec
+++ b/golang.spec
@@ -96,8 +96,8 @@
 %endif
 
 %global go_api 1.20
-%global version 1.20.3
-%global pkg_release 1
+%global version 1.20.4
+%global pkg_release 3
 
 Name:           golang
 Version:        %{version}
@@ -520,6 +520,10 @@ cd ..
 %endif
 
 %changelog
+* Mon May 29 2023 Alejandro Sáez <asm@redhat.com> - 1.20.4-1
+- Rebase to Go 1.20.4
+- Resolves: rhbz#2204474
+
 * Tue Apr 11 2023 David Benoit <dbenoit@redhat.com> - 1.20.3-1
 - Rebase to Go 1.20.3
 - Remove race archives
diff --git a/sources b/sources
index e6c0476..b93747a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.20.3.tar.gz) = 2d7cd1561f6f65d189e050ad321e5e619ad4956aa3d3e8b14165c596f8596b32c5afde0d43e51c0fae9f589b460ca5f52aade1125942e799d4db37089e88ddd1
-SHA512 (go1.20.3-1-openssl-fips.tar.gz) = db7a79ddee78bf32a2a334dd31af355f5acf0b32ea26d0a8b6649d04e48911a2b2c479b38a0e6343ca9de56a7aafe1ea7f2b53e39b5f8248ea8ed822ce7a2a5e
+SHA512 (go1.20.4.tar.gz) = 551414f199b378014c10e54471392ea45ae1548109da68c14256dc5d447cc1f0e110db1a8efa857ba824fa5a0fc8e41e9442e55b98329dda8a353559e1c05fec
+SHA512 (go1.20.4-3-openssl-fips.tar.gz) = b3c3a61e44e61c0e4feb1c499d194630d0c9466cfd06daf86e523c0b54933f5a63d350dc0eef3f0f38dc30598fb1a636f14812a0d3d56f9673da1b9f373d5513