diff --git a/.gitignore b/.gitignore
index 97182ad..c7149ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,4 @@
 /go1.20.1.src.tar.gz
 /go1.20.2.src.tar.gz
 /go1.20.3.src.tar.gz
+/go1.20.4.src.tar.gz
diff --git a/golang.spec b/golang.spec
index 71883ca..387a66c 100644
--- a/golang.spec
+++ b/golang.spec
@@ -108,7 +108,7 @@
 # Comment out go_prerelease and go_patch as needed
 %global go_api 1.20
 #global go_prerelease rc3
-%global go_patch 3
+%global go_patch 4
 
 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
 %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
@@ -174,6 +174,10 @@ Obsoletes:      %{name}-data < 1.1.1-4
 Obsoletes:      %{name}-vim < 1.4
 Obsoletes:      emacs-%{name} < 1.4
 
+# We stopped building the golang-race subpackage, so we need to to maintain the
+# update path.
+Obsoletes:      golang-race < 1.20~rc3-2
+
 # These are the only RHEL/Fedora architectures that we compile this package for
 ExclusiveArch:  %{golang_arches}
 
@@ -542,9 +546,16 @@ fi
 %endif
 
 %changelog
-* Tue Apr 18 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.20.3-1.0.riscv64
+* Mon May 08 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.20.4-1.0.riscv64
 - Enable riscv64
 
+* Fri May 05 2023 Alejandro Sáez <asm@redhat.com> - 1.20.4-1
+- Update to go1.20.4
+- Resolves: rhbz#2184454
+
+* Sat Apr 15 2023 Maxwell G <maxwell@gtmx.me> - 1.20.3-2
+- Fix broken golang-race update path
+
 * Tue Apr 04 2023 Alejandro Sáez <asm@redhat.com> - 1.20.3-1
 - Update to go1.20.3
 
diff --git a/sources b/sources
index 8d5f727..9d1d6c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.20.3.src.tar.gz) = 47ebb3925956a3facef9e5e6f4efec3058e55632020ea247844c55b160d23e2be3880ea24dec2f73382a7c7858259896cbb7de1bb764c481c176bed479676029
+SHA512 (go1.20.4.src.tar.gz) = 43898325bab48c24e533f360a2c7de356a8a56946602e727b5bcd4a62ff4f64fd750e2650032f7e0525b0699e40e506d79446e16838f097e6bdc2a16f10d81be