diff --git a/.gitignore b/.gitignore
index b37601a..3bed187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/go-go-1.16.1-2-openssl-fips.tar.gz
+SOURCES/go-go-1.16.4-1-openssl-fips.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 2cdf7d4..4c8a30d 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1 +1 @@
-9a5913959f35691df64f8993c2b4779f983de499 SOURCES/go-go-1.16.1-2-openssl-fips.tar.gz
+1edcf3e54204d79803b3ca8eb84fe6ef2941dad0 SOURCES/go-go-1.16.4-1-openssl-fips.tar.gz
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index e940525..4e99e8f 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -96,12 +96,12 @@
 %endif
 
 %global go_api 1.16
-%global go_version 1.16.1
-%global pkg_release 2
+%global go_version 1.16.4
+%global pkg_release 1
 
 Name:           golang
 Version:        %{go_version}
-Release:        3%{?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,9 @@ cd ..
 %endif
 
 %changelog
+* Mon May 24 2021 Alejandro Sáez <asm@redhat.com> - 1.16.4-1
+- Rebase to go-1.16.4-1-openssl-fips
+
 * Tue May 04 2021 Alejandro Sáez <asm@redhat.com> - 1.16.1-3
 - Resolves: rhbz#1956891