diff --git a/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 b/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2
deleted file mode 100644
index fdfc7bf..0000000
--- a/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:636909d0ba6c11fe122d1e24b77545916b077e1138fd771c8ee1864e11465806
-size 151815515
diff --git a/ceph-15.2.2-60-gf5864377ab.tar.bz2 b/ceph-15.2.2-60-gf5864377ab.tar.bz2
new file mode 100644
index 0000000..37b5403
--- /dev/null
+++ b/ceph-15.2.2-60-gf5864377ab.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77bbceb6cf295462c110395fa4faa1a0bb4f6a8e1bca8409ff95987055789470
+size 151884521
diff --git a/ceph-test.changes b/ceph-test.changes
index 66eb454..d828b14 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 25 12:57:39 UTC 2020 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 15.2.2-60-gf5864377ab:
+  + rebase on tip of upstream "octopus" branch, SHA1 9e890709ef53ce29006c6fc754dd80e25df186d0
+
 -------------------------------------------------------------------
 Tue May 19 15:00:23 UTC 2020 - Nathan Cutler <ncutler@suse.com>
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 70dfd19..6753792 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -99,7 +99,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 15.2.2.18+g1dbcddb5d8
+Version: 15.2.2.60+gf5864377ab
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -115,7 +115,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-15.2.2-18-g1dbcddb5d8.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-15.2.2-60-gf5864377ab.tar.bz2
 %if 0%{?suse_version}
 Source96: checkin.sh
 Source97: README-checkin.txt
@@ -544,7 +544,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-15.2.2-18-g1dbcddb5d8
+%autosetup -p1 -n ceph-15.2.2-60-gf5864377ab
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
@@ -1164,6 +1164,7 @@ rm -rf %{buildroot}
 %if 0%{with cephfs_shell}
 %endif
 %if 0%{with ceph_test_package}
+%files -n ceph-test
 %{_bindir}/ceph-client-debug
 %{_bindir}/ceph_bench_log
 %{_bindir}/ceph_kvstorebench
diff --git a/ceph.changes b/ceph.changes
index 66eb454..d828b14 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 25 12:57:39 UTC 2020 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 15.2.2-60-gf5864377ab:
+  + rebase on tip of upstream "octopus" branch, SHA1 9e890709ef53ce29006c6fc754dd80e25df186d0
+
 -------------------------------------------------------------------
 Tue May 19 15:00:23 UTC 2020 - Nathan Cutler <ncutler@suse.com>
 
diff --git a/ceph.spec b/ceph.spec
index 2d14324..748538d 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -99,7 +99,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	15.2.2.18+g1dbcddb5d8
+Version:	15.2.2.60+gf5864377ab
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -115,7 +115,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-15.2.2-18-g1dbcddb5d8.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-15.2.2-60-gf5864377ab.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -1121,7 +1121,7 @@ This package provides Ceph’s default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-15.2.2-18-g1dbcddb5d8
+%autosetup -p1 -n ceph-15.2.2-60-gf5864377ab
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed: