diff --git a/.gitignore b/.gitignore
index 32726a5..accaaad 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,7 @@
 /postgresql-16.1.tar.bz2.sha256
 /postgresql-15.5.tar.bz2
 /postgresql-15.5.tar.bz2.sha256
+/postgresql-15.8.tar.bz2
+/postgresql-15.8.tar.bz2.sha256
+/postgresql-16.4.tar.bz2
+/postgresql-16.4.tar.bz2.sha256
diff --git a/postgresql.spec b/postgresql.spec
index e6cd3a8..dcc5161 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 16
-Version: %{majorversion}.1
+Version: %{majorversion}.4
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
 %global prevmajorversion 15
-%global prevversion %{prevmajorversion}.5
+%global prevversion %{prevmajorversion}.8
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1077,6 +1077,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/system_constraints.sql
 %{_datadir}/pgsql/system_functions.sql
 %{_datadir}/pgsql/system_views.sql
+%{_datadir}/pgsql/fix-CVE-2024-4317.sql
 %{_datadir}/pgsql/timezonesets/
 %{_datadir}/pgsql/tsearch_data/
 %dir %{_datadir}/postgresql-setup
@@ -1216,6 +1217,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Aug 12 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.4-1
+- Update to 16.4
+- Fix CVE-2024-7348
+
 * Mon Jan 08 2024 Filip Janus <fjanus@redhat.com> - 16.1-1
 - Update to 16.1
 - Update upgrade server to 15.5
diff --git a/sources b/sources
index 9afa423..8dbc67f 100755
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (postgresql-setup-8.9.tar.gz) = 9c9332136ada2e6152b70ec9688355158f819201526ee21521d9e65eba1caa32085260339b0aac1dddfeef0661d4ea8375838f0e39ca381f46af27cee6692a40
-SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918
-SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1
-SHA512 (postgresql-15.5.tar.bz2) = 9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc
-SHA512 (postgresql-15.5.tar.bz2.sha256) = 896ad3a1952f54bc5186d49eb4faec40843813d3e1c200f7b27f0e099b426ef9b59e0c15cb5453ac166e8a566b24178b95836776207de0bf19f5e021fdccfbca
+SHA512 (postgresql-15.8.tar.bz2) = da610d878819179fcafe8adf6cbe72e188537dbaff82457c67013f9089ae8cbb1f6d8c4d5ea62e4ef54c3e2a90060bd1f36b71b8531354279181e574d903940c
+SHA512 (postgresql-15.8.tar.bz2.sha256) = c5e316703010fa796aaa27a12350dd3c721513a75d9367ce6c4f740e1b35a3ca50e0ba16794e79c2c827f6e24f344f3345c2b9d2c7e0d2f7a546875105d62771
+SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96
+SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674
+SHA512 (postgresql-setup-8.9.tar.gz) = 118e9ebf858722a38b0e90324bc1b49fc7058cda601ca0a7e78c94e7b95e89d6dbbc46f377626364b068614ced3cde3cb4733973ad2d71bf17892ad773657ef7