diff --git a/ceph-16.2.9-158-gd93952c7eea.tar.bz2 b/ceph-16.2.9-158-gd93952c7eea.tar.bz2
deleted file mode 100644
index 860438f..0000000
--- a/ceph-16.2.9-158-gd93952c7eea.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06ee70a43bffb6050581b60c8ef9dc7a6de50589c8082e12fc93cc533793b589
-size 155323570
diff --git a/ceph-16.2.9-536-ga4b2af9947d.tar.bz2 b/ceph-16.2.9-536-ga4b2af9947d.tar.bz2
new file mode 100644
index 0000000..52ca447
--- /dev/null
+++ b/ceph-16.2.9-536-ga4b2af9947d.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7a4459270698b31ae1ea940f927d5c7e4e3c8e18c12e77f02c52389da546f43
+size 155194666
diff --git a/ceph-test.changes b/ceph-test.changes
index c455044..1a57614 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 12 23:47:58 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
+
+- Update to 16.2.9-536-ga4b2af9947d:
+  + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR 
+
 -------------------------------------------------------------------
 Thu Jun  9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com>
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 2cb77fe..1037eb5 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -30,7 +30,11 @@
 %else
 %bcond_without tcmalloc
 %endif
+%if 0%{?rhel} >= 9
+%bcond_without system_pmdk
+%else
 %bcond_with system_pmdk
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
 %ifarch x86_64 ppc64le
@@ -121,11 +125,18 @@
 # disable dwz which compresses the debuginfo
 %global _find_debuginfo_dwz_opts %{nil}
 
+%if 0%{with seastar}
+# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin
+# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
+# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
+%undefine _annotated_build
+%endif
+
 #################################################################################
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 16.2.9.158+gd93952c7eea
+Version: 16.2.9.536+ga4b2af9947d
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -141,7 +152,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.9-158-gd93952c7eea.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.9-536-ga4b2af9947d.tar.bz2
 %if 0%{?suse_version}
 Source94: ceph-rpmlintrc
 Source95: checkin.sh
@@ -584,7 +595,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-16.2.9-158-gd93952c7eea
+%autosetup -p1 -n ceph-16.2.9-536-ga4b2af9947d
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
diff --git a/ceph.changes b/ceph.changes
index c455044..1a57614 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 12 23:47:58 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
+
+- Update to 16.2.9-536-ga4b2af9947d:
+  + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR 
+
 -------------------------------------------------------------------
 Thu Jun  9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com>
 
diff --git a/ceph.spec b/ceph.spec
index e7aaab1..dea1797 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -30,7 +30,11 @@
 %else
 %bcond_without tcmalloc
 %endif
+%if 0%{?rhel} >= 9
+%bcond_without system_pmdk
+%else
 %bcond_with system_pmdk
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
 %ifarch x86_64 ppc64le
@@ -121,11 +125,18 @@
 # disable dwz which compresses the debuginfo
 %global _find_debuginfo_dwz_opts %{nil}
 
+%if 0%{with seastar}
+# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin
+# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
+# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
+%undefine _annotated_build
+%endif
+
 #################################################################################
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	16.2.9.158+gd93952c7eea
+Version:	16.2.9.536+ga4b2af9947d
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -141,7 +152,7 @@ License:	LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	%{?_remote_tarball_prefix}ceph-16.2.9-158-gd93952c7eea.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-16.2.9-536-ga4b2af9947d.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -1197,7 +1208,7 @@ This package provides Ceph default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-16.2.9-158-gd93952c7eea
+%autosetup -p1 -n ceph-16.2.9-536-ga4b2af9947d
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed: