diff --git a/postgresql-15.8.tar.bz2 b/postgresql-15.8.tar.bz2
deleted file mode 100644
index 480b8c4..0000000
--- a/postgresql-15.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a
-size 23119460
diff --git a/postgresql-15.8.tar.bz2.sha256 b/postgresql-15.8.tar.bz2.sha256
deleted file mode 100644
index e4ec36d..0000000
--- a/postgresql-15.8.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a  postgresql-15.8.tar.bz2
diff --git a/postgresql-15.9.tar.bz2 b/postgresql-15.9.tar.bz2
new file mode 100644
index 0000000..4871b50
--- /dev/null
+++ b/postgresql-15.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74f2d4565035f0cf729ecb059949faaf1102cbd93759b359822f98f82198c783
+size 23135232
diff --git a/postgresql-15.9.tar.bz2.sha256 b/postgresql-15.9.tar.bz2.sha256
new file mode 100644
index 0000000..b588f32
--- /dev/null
+++ b/postgresql-15.9.tar.bz2.sha256
@@ -0,0 +1 @@
+74f2d4565035f0cf729ecb059949faaf1102cbd93759b359822f98f82198c783  postgresql-15.9.tar.bz2
diff --git a/postgresql15.changes b/postgresql15.changes
index 5f27603..e7b7009 100644
--- a/postgresql15.changes
+++ b/postgresql15.changes
@@ -1,10 +1,31 @@
+-------------------------------------------------------------------
+Wed Nov 13 13:55:01 UTC 2024 - Reinhard Max <max@suse.com>
+
+- Upgrade to 15.9:
+  * CVE-2024-10976, bsc#1233323: Ensure cached plans are marked as
+    dependent on the calling role when RLS applies to a
+    non-top-level table reference.
+  * CVE-2024-10977, bsc#1233325: Make libpq discard error messages
+    received during SSL or GSS protocol negotiation.
+  * CVE-2024-10978, bsc#1233326: Fix unintended interactions
+    between SET SESSION AUTHORIZATION and SET ROLE
+  * CVE-2024-10979, bsc#1233327: Prevent trusted PL/Perl code from
+    changing environment variables.
+  * https://www.postgresql.org/about/news/p-2955/
+  * https://www.postgresql.org/docs/release/15.9/
+
+-------------------------------------------------------------------
+Tue Nov  5 12:35:17 UTC 2024 - Reinhard Max <max@suse.com>
+
+- Sync spec file from postgresql17.
+
 -------------------------------------------------------------------
 Sat Aug 10 14:11:36 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 
 - Upgrade to 15.8 (bsc#1229013):
   * bsc#1229013, CVE-2024-7348 PostgreSQL relation replacement
     during pg_dump executes arbitrary SQL
-  * https://www.postgresql.org/about/news/postgresql-164-158-1413-1316-1220-and-17-beta-3-released-2910/
+  * https://www.postgresql.org/about/news/p-2910/
   * https://www.postgresql.org/docs/release/15.8/
 
 -------------------------------------------------------------------
diff --git a/postgresql15.spec b/postgresql15.spec
index e1bf732..ee77723 100644
--- a/postgresql15.spec
+++ b/postgresql15.spec
@@ -16,11 +16,13 @@
 #
 
 
-%define pgversion 15.8
+%define pgversion 15.9
 %define pgmajor 15
 %define buildlibs 0
 %define tarversion %{pgversion}
-%define latest_supported_llvm_ver 18
+%define oldest_supported_llvm_ver 10
+# To be able to use cmake(LLVM) < ...
+%define latest_supported_llvm_ver_plus_one 19
 
 ### CUT HERE ###
 %define pgname postgresql%pgmajor
@@ -73,6 +75,12 @@ Name:           %pgname
 %bcond_without libzstd
 %endif
 
+%if %{without derived}
+BuildRequires:  bison
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  flex
+BuildRequires:  perl
+%endif
 %if %mini
 %bcond_with  selinux
 %if %pgmajor >= 16
@@ -94,12 +102,6 @@ BuildRequires:  zlib-devel
 %if %{with liblz4}
 BuildRequires:  pkgconfig(liblz4)
 %endif
-%if %{without derived}
-BuildRequires:  bison
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  flex
-BuildRequires:  perl
-%endif
 
 %if %{with libzstd}
 BuildRequires:  pkgconfig(libzstd)
@@ -144,13 +146,8 @@ BuildRequires:  libselinux-devel
 %endif
 %if %{with llvm}
 BuildRequires:  gcc-c++
-%if 0%{?product_libs_llvm_ver} > %{latest_supported_llvm_ver}
-BuildRequires:  clang%{latest_supported_llvm_ver}
-BuildRequires:  llvm%{latest_supported_llvm_ver}-devel
-%else
-BuildRequires:  clang
-BuildRequires:  llvm-devel
-%endif
+BuildRequires:  (cmake(Clang) >= %{oldest_supported_llvm_ver} with cmake(Clang) < %{latest_supported_llvm_ver_plus_one})
+BuildRequires:  (cmake(LLVM)  >= %{oldest_supported_llvm_ver} with cmake(LLVM)  < %{latest_supported_llvm_ver_plus_one})
 %endif
 BuildRequires:  libxslt-devel
 BuildRequires:  openldap2-devel
@@ -610,6 +607,7 @@ VLANG=%pgmajor
 make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/include install
 make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/interfaces install
 rm -rf %buildroot%pgincludedir/server
+rm -rf %buildroot%pgdatadir
 %else
 make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname install install-docs
 %if 0
@@ -772,8 +770,6 @@ done
 %endif
 popd
 
-mkdir -p %buildroot%pgmandir/man1
-cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor
 %find_lang ecpg-$VLANG devel.files
 # The devel subpackage is exclusive across versions
 # and not handled by update-alternatives.
@@ -791,8 +787,10 @@ cat server-devel.files >> devel.files
 # Build up the file lists for the libpq and libecpg packages
 cat > libpq.files <<EOF
 %defattr(-,root,root)
+%if !%mini
 %dir %pgdatadir
 %pgdatadir/pg_service.conf.sample
+%endif
 EOF
 find %buildroot -name 'libpq*.so.*' -printf '/%%P\n' >> libpq.files
 %find_lang libpq5-$VLANG libpq.files
@@ -978,12 +976,13 @@ fi
 %_libdir/pkgconfig/*
 %_libdir/lib*.so
 %pgincludedir
+
 %if %{with server_devel}
 %exclude %pgincludedir/server
 %endif
-%doc %pgmandir/man1/ecpg.1*
 
 %if !%mini
+%doc %pgmandir/man1/ecpg.1*
 %if %{with server_devel}
 %files server-devel -f server-devel.files
 %endif