diff --git a/.gitignore b/.gitignore
index ee3bd3e..de72502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ SOURCES/samba-4.16.2.tar.xz
 SOURCES/samba-4.16.2.tar.asc
 SOURCES/samba-4.16.3.tar.xz
 SOURCES/samba-4.16.3.tar.asc
+SOURCES/samba-4.16.4.tar.xz
+SOURCES/samba-4.16.4.tar.asc
diff --git a/.samba.metadata b/.samba.metadata
index ce7610a..543ed25 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-c0cf967153a74001a21b70464b1fada60639ba34 SOURCES/samba-4.16.3.tar.xz
-b593bda83bce8843dd8a382a8932d4812f1e417d SOURCES/samba-4.16.3.tar.asc
+c943ec2e8b9413cd3465e39481b49872b4486e86 SOURCES/samba-4.16.4.tar.xz
+6275fdcbb8a03e0fa87abbb163550bae16372d26 SOURCES/samba-4.16.4.tar.asc
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 76d0c7d..ecc9f2e 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -8,7 +8,7 @@
 
 %define main_release 100
 
-%define samba_version 4.16.3
+%define samba_version 4.16.4
 # This should be rc1 or nil
 %define pre_release %nil
 
@@ -2807,6 +2807,7 @@ rm -rf %{buildroot}
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgs_tests.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/kpasswd_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/ms_kile_client_principal_lookup_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/pac_align_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/raw_testcase.*.pyc
@@ -2833,6 +2834,7 @@ rm -rf %{buildroot}
 %{python3_sitearch}/samba/tests/krb5/kdc_base_test.py
 %{python3_sitearch}/samba/tests/krb5/kdc_tests.py
 %{python3_sitearch}/samba/tests/krb5/kdc_tgs_tests.py
+%{python3_sitearch}/samba/tests/krb5/kpasswd_tests.py
 %{python3_sitearch}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
 %{python3_sitearch}/samba/tests/krb5/pac_align_tests.py
 %{python3_sitearch}/samba/tests/krb5/raw_testcase.py
@@ -3974,6 +3976,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Jul 29 2022 - Anoop C S <anoopcs@samba.org> - 4.16.4-100
+- v4.16.4 GA
+
 * Tue Jul 19 2022 - Anoop C S <anoopcs@samba.org> - 4.16.3-100
 - v4.16.3 GA