diff --git a/.gitignore b/.gitignore
index 84e812d..e3d5a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-13.14.tar.bz2
-SOURCES/postgresql-15.6-US.pdf
-SOURCES/postgresql-15.6.tar.bz2
+SOURCES/postgresql-13.16.tar.bz2
+SOURCES/postgresql-15.8-US.pdf
+SOURCES/postgresql-15.8.tar.bz2
 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index b55ccde..a9b99d2 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-79dbababe688d5589fa1d255656bf2e8e35730ce SOURCES/postgresql-13.14.tar.bz2
-dd87738d2b2d8ccd3afcd414a1d47d9819e8cbff SOURCES/postgresql-15.6-US.pdf
-c62fb81e3eccbab523d840a7717c14a0b3a82a02 SOURCES/postgresql-15.6.tar.bz2
+a2465d5086abb2b2ff9115541cae404f869dfa0f SOURCES/postgresql-13.16.tar.bz2
+54911c9280f6c96d142aee99f9493abfa49c21e3 SOURCES/postgresql-15.8-US.pdf
+4decf90a7557c41fc61312e8696f59e0f7123d2a SOURCES/postgresql-15.8.tar.bz2
 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/SOURCES/postgresql-13.14.tar.bz2.sha256 b/SOURCES/postgresql-13.14.tar.bz2.sha256
deleted file mode 100644
index 76e8707..0000000
--- a/SOURCES/postgresql-13.14.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed  postgresql-13.14.tar.bz2
diff --git a/SOURCES/postgresql-13.16.tar.bz2.sha256 b/SOURCES/postgresql-13.16.tar.bz2.sha256
new file mode 100644
index 0000000..8b1d6f3
--- /dev/null
+++ b/SOURCES/postgresql-13.16.tar.bz2.sha256
@@ -0,0 +1 @@
+c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865  postgresql-13.16.tar.bz2
diff --git a/SOURCES/postgresql-15.6.tar.bz2.sha256 b/SOURCES/postgresql-15.6.tar.bz2.sha256
deleted file mode 100644
index b9cc1cf..0000000
--- a/SOURCES/postgresql-15.6.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb  postgresql-15.6.tar.bz2
diff --git a/SOURCES/postgresql-15.8.tar.bz2.sha256 b/SOURCES/postgresql-15.8.tar.bz2.sha256
new file mode 100644
index 0000000..21864c7
--- /dev/null
+++ b/SOURCES/postgresql-15.8.tar.bz2.sha256
@@ -0,0 +1 @@
+4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a  postgresql-15.8.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index e12521e..f905089 100755
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.6
+Version: %{majorversion}.8
 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 13
-%global prevversion %{prevmajorversion}.14
+%global prevversion %{prevmajorversion}.16
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1086,6 +1086,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
@@ -1226,6 +1227,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Aug 12 2024 Ales Nezbeda <anezbeda@redhat.com> - 15.8-1
+- Update to 15.8
+- Fix CVE-2024-7348
+
 * Fri Feb 9 2024 Filip Janus <fjanus@redhat.com> 15.6-1
 - Update to 15.6 and 13.14
 - Fix CVE-2024-0985
@@ -1233,7 +1238,6 @@ make -C postgresql-setup-%{setup_version} check
 Mon Nov 13 2023 Jorge San Emeterio <jsanemet@redhat.com> - 15.5-1
 - Update to upstream version 15.5
 - Fixes: CVE-2023-5868 CVE-2023-5869 CVE-2023-5870 CVE-2023-39417 CVE-2023-39418
-- Resolves: RHEL-16088 RHEL-16135 RHEL-16137
 
 * Mon Aug 28 2023 Jorge San Emeterio <jsanemet@redhat.com> - 15.3-1
 - Update to upstream version 15.3