diff --git a/go-toolset.spec b/go-toolset.spec
index 4cb1cf9..23cb6b6 100644
--- a/go-toolset.spec
+++ b/go-toolset.spec
@@ -1,8 +1,8 @@
-%global go_version 1.16.1
+%global go_version 1.16.4
 
 Name: go-toolset
 Version: %{go_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Package that installs go-toolset
 License: BSD and Public Domain
 
@@ -18,6 +18,12 @@ This is the main package for go-toolset.
 %files
 
 %changelog
+* Tue May 18 2021 Alejandro Sáez <asm@redhat.com> - 1.16.4-1
+- Rebase to 1.16.4
+- Resolves: rhbz#1955035
+- Resolves: rhbz#1957961
+
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.16.1-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937