diff --git a/.gitignore b/.gitignore
index dd01b35..dc6d26e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,4 @@
 /go1.18.1.src.tar.gz
 /go1.18.2.src.tar.gz
 /go1.18.3.src.tar.gz
+/go1.18.4.src.tar.gz
diff --git a/golang.spec b/golang.spec
index f18cf6c..5291aa0 100644
--- a/golang.spec
+++ b/golang.spec
@@ -108,13 +108,13 @@
 # Comment out go_prerelease and go_patch as needed
 %global go_api 1.18
 #global go_prerelease rc1
-%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}
  
 # For rpmdev-bumpspec and releng automation
-%global baserelease 2
+%global baserelease 1
  
 Name:           golang
 Version:        %{go_version}
@@ -541,6 +541,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 13 2022 Alejandro Sáez <asm@redhat.com> - 1.18.4-1
+- Update to 1.18.4
+
 * Wed Jun 22 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.18.3-2
 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
   CVE-2022-29526, CVE-2022-30629
diff --git a/sources b/sources
index 166dc28..d77510c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.18.3.src.tar.gz) = bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
+SHA512 (go1.18.4.src.tar.gz) = 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b