diff --git a/.gitignore b/.gitignore
index 4827ef8..7defbd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-13.22.tar.bz2
-SOURCES/postgresql-15.14-US.pdf
-SOURCES/postgresql-15.14.tar.bz2
+SOURCES/postgresql-15.15-US.pdf
+SOURCES/postgresql-15.15.tar.bz2
 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index de07bb5..066e33b 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 3a5f8f2a4e889c395db905147be40dc1f8192fa4 SOURCES/postgresql-13.22.tar.bz2
-5c6a6a399507d7826a5e0322ba9730586d0c928f SOURCES/postgresql-15.14-US.pdf
-474c7ee4c36f34dac2080c7ec569f1b485df724e SOURCES/postgresql-15.14.tar.bz2
+74d630b75283a482a1b765f7b442e8c5f5465313 SOURCES/postgresql-15.15-US.pdf
+8833e4dd4ff75186451415bf61cd5f1d60078d50 SOURCES/postgresql-15.15.tar.bz2
 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.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.15.tar.bz2.sha256 b/SOURCES/postgresql-15.15.tar.bz2.sha256
new file mode 100644
index 0000000..65f8e97
--- /dev/null
+++ b/SOURCES/postgresql-15.15.tar.bz2.sha256
@@ -0,0 +1 @@
+5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa  postgresql-15.15.tar.bz2
diff --git a/SOURCES/postgresql.tmpfiles.d b/SOURCES/postgresql.tmpfiles.d
deleted file mode 100644
index 6c48e34..0000000
--- a/SOURCES/postgresql.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 0755 postgres postgres -
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index aa268d1..a4e8a0f 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,8 +62,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.14
-Release: 1%{?dist}
+Version: %{majorversion}.15
+Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -89,7 +89,6 @@ Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}
 Source1: postgresql-%{version}-US.pdf
 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
 
@@ -451,6 +450,15 @@ 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
@@ -708,7 +716,9 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+install -m 0644 postgresql.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+
+install -m 0644 -D postgresql.sysusers.conf $RPM_BUILD_ROOT%{_sysusersdir}/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
@@ -1121,6 +1131,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postmaster.*
 %{_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
@@ -1227,7 +1238,15 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Mon Sep 1 2025 David Sloboda <david.x.sloboda@oracle.com> - 15.14-1
+* Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 15.15-2
+- Add sysusers configuration and generate tmpfiles.d dynamically
+- Resolves: RHEL-133896
+
+* Mon Dec 01 2025 Filip Janus <fjanus@redhat.com> - 15.15-1
+- Update to 15.15
+- Resolves: RHEL-128813 (CVE-2025-12818)
+
+* Fri Aug 15 2025 Filip Janus <fjanus@redhat.com> - 15.14-1
 - Update to 15.14
 
 * Thu Feb 20 2025 Ales Nezbeda <anezbeda@redhat.com> - 15.12-1