diff --git a/.gitignore b/.gitignore
index f8858ec..7af911b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-15.14.tar.bz2
-SOURCES/postgresql-16.11.tar.bz2
+SOURCES/postgresql-15.17.tar.bz2
+SOURCES/postgresql-16.13.tar.bz2
 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 6ddaf9c..cca86c1 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
-474c7ee4c36f34dac2080c7ec569f1b485df724e SOURCES/postgresql-15.14.tar.bz2
-7c93e10c6d400e76b0e2ab29334efde7d58cd0ba SOURCES/postgresql-16.11.tar.bz2
+09a3926425707ffcf1dd7a5bae8869f921659c13 SOURCES/postgresql-15.17.tar.bz2
+b66b3bf5bf717f37371dc3fd8de8831d1f26dd40 SOURCES/postgresql-16.13.tar.bz2
 25a05ef36218b1de80d8eeb55f4b4e0b723bd7f6 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/SOURCES/postgresql-15.14.tar.bz2.sha256 b/SOURCES/postgresql-15.14.tar.bz2.sha256
deleted file mode 100644
index b041087..0000000
--- a/SOURCES/postgresql-15.14.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2  postgresql-15.14.tar.bz2
diff --git a/SOURCES/postgresql-15.17.tar.bz2.sha256 b/SOURCES/postgresql-15.17.tar.bz2.sha256
new file mode 100644
index 0000000..9b51ec2
--- /dev/null
+++ b/SOURCES/postgresql-15.17.tar.bz2.sha256
@@ -0,0 +1 @@
+ae14f24c14727e0b2ded1c5553031666099bd1054db3ef44bfa6e2bd6d554a56  postgresql-15.17.tar.bz2
diff --git a/SOURCES/postgresql-16.11.tar.bz2.sha256 b/SOURCES/postgresql-16.11.tar.bz2.sha256
deleted file mode 100644
index 11193b8..0000000
--- a/SOURCES/postgresql-16.11.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-6deb08c23d03d77d8f8bd1c14049eeef64aef8968fd8891df2dfc0b42f178eac  postgresql-16.11.tar.bz2
diff --git a/SOURCES/postgresql-16.13.tar.bz2.sha256 b/SOURCES/postgresql-16.13.tar.bz2.sha256
new file mode 100644
index 0000000..017f6bc
--- /dev/null
+++ b/SOURCES/postgresql-16.13.tar.bz2.sha256
@@ -0,0 +1 @@
+dc2ddbbd245c0265a689408e3d2f2f3f9ba2da96bd19318214b313cdd9797287  postgresql-16.13.tar.bz2
diff --git a/SOURCES/postgresql.tmpfiles.d b/SOURCES/postgresql.tmpfiles.d
new file mode 100644
index 0000000..6c48e34
--- /dev/null
+++ b/SOURCES/postgresql.tmpfiles.d
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 627a7ee..70abdac 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 16
-Version: %{majorversion}.11
+Version: %{majorversion}.13
 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}.14
+%global prevversion %{prevmajorversion}.17
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -84,9 +84,9 @@ Url: http://www.postgresql.org/
 %global service_name postgresql.service
 
 Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# The PDF file is generated by generate-pdf.sh, which see for comments
 Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2
 Source4: Makefile.regress
+Source9: postgresql.tmpfiles.d
 Source10: postgresql.pam
 Source11: postgresql-bashprofile
 
@@ -110,7 +110,6 @@ Patch12: postgresql-no-libecpg.patch
 
 BuildRequires: make
 BuildRequires: gcc
-BuildRequires: lz4-devel, libzstd-devel
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 BuildRequires: perl(Opcode)
@@ -444,15 +443,6 @@ find . -type f -name Makefile -exec sed -i -e "s/SO_MAJOR_VERSION=\s\?\([0-9]\+\
 # remove .gitignore files to ensure none get into the RPMs (bug #642210)
 find . -type f -name .gitignore | xargs rm
 
-cat > postgresql.sysusers.conf <<EOF
-u postgres 26 'PostgreSQL Server' /var/lib/pgsql /bin/bash
-EOF
-
-cat > postgresql.tmpfiles.conf <<EOF
-d /run/postgresql 0755 postgres postgres -
-d /var/lib/pgsql 0700 postgres postgres -
-EOF
-
 
 %build
 # Avoid LTO on armv7hl as it runs out of memory
@@ -491,8 +481,6 @@ export CFLAGS
 
 common_configure_options='
 	--disable-rpath
-	--with-lz4
-	--with-zstd
 %if %beta
 	--enable-debug
 	--enable-cassert
@@ -621,8 +609,6 @@ upgrade_configure ()
 		--host=%{_host} \
 		--prefix=%prev_prefix \
 		--disable-rpath \
-		--with-lz4 \
-		--with-zstd \
 %if %beta
 		--enable-debug \
 		--enable-cassert \
@@ -709,10 +695,12 @@ install -d $RPM_BUILD_ROOT/etc/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
 %endif
 
-mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-install -m 0644 postgresql.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+# Create the directory for sockets.
+install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql
 
-install -m 0644 -D postgresql.sysusers.conf $RPM_BUILD_ROOT%{_sysusersdir}/postgresql.conf
+# ... and make a tmpfiles script to recreate it at reboot.
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
 
 # PGDATA needs removal of group and world permissions due to pg_pwd hole.
 install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data
@@ -1122,13 +1110,12 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postgresql-upgrade.*
 %{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
-%{_sysusersdir}/postgresql.conf
 %{_unitdir}/*postgresql*.service
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql
 %attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data
-%ghost %attr(755,postgres,postgres) %dir %{?_rundir}/postgresql
+%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql
 %if %pam
 %config(noreplace) /etc/pam.d/postgresql
 %endif
@@ -1229,39 +1216,36 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 16.11-1
-- Update to 16.11
-- Add sysusers configuration and generate tmpfiles.d dynamically
-- Resolves: RHEL-123193 (CVE-2025-12818)
+* Fri Feb 27 2026 Filip Janus <fjanus@redhat.com> - 16.13-1
+- Update to 16.13
+- Fix CVE-2026-2004: PostgreSQL intarray missing validation of type of input
+- Fix CVE-2026-2005: PostgreSQL pgcrypto heap buffer overflow
+- Fix CVE-2026-2006: PostgreSQL missing validation of multibyte character length
+- Resolves: RHEL-149371 RHEL-149404 RHEL-149338
 
-* Wed Sep 3 2025 Filip Janus <fjanus@redhat.com> - 16.10-1
+* Mon Dec 01 2025 Filip Janus <fjanus@redhat.com> - 16.11-1
+- Update to 16.11
+- Resolves: RHEL-128820 (CVE-2025-12818)
+
+* Mon Aug 18 2025 Filip Janus <fjanus@redhat.com> - 16.10-1
 - Update to 16.10
 
 * Tue Feb 18 2025 Filip Janus <fjanus@redhat.com> - 16.8-1
 - Update to 16.8
 - Fix CVE-2025-1094
 
-* Fri Nov 22 2024 Lukas Javorsky <ljavorsk@redhat.com> - 16.6-1
+* Thu Nov 21 2024 Lukas Javorsky <ljavorsk@redhat.com> - 16.6-1
 - Update to 16.6
 - Fixes: CVE-2024-10976 CVE-2024-10978 CVE-2024-10979
 
-* Fri Aug 16 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.4-2
-- Fix build on 16.4
-
-* Tue Aug 6 2024 Filip Janus <fjanus@redhat.com> - 16.4-1
+* Mon Aug 12 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.4-1
 - Update to 16.4
-
-* Tue Jul 30 2024 Filip Janus <fjanus@redhat.com> - 16.1-3
-- Remove /var/run/postgresql
-- Related: RHEL-51275
-
-* Mon Jul 15 2024 Filip Janus <fjanus@redhat.com> - 16.1-2
-- Enable lz4 and zstd support
+- 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
-- Resolves: RHEL-3636
+- Resolves: RHEL-3635
 
 * Mon Oct 09 2023 Filip Janus <fjanus@redhat.com> - 16.0-1
 - New postgresql stream - 16