diff --git a/ceph-13.0.0-3535-g8b10d08c04.tar.bz2 b/ceph-13.0.0-3535-g8b10d08c04.tar.bz2
new file mode 100644
index 0000000..ed66350
--- /dev/null
+++ b/ceph-13.0.0-3535-g8b10d08c04.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13cf2325f95e99d5c187a7a39bb13be76410bcef4d829b1a46117db47d0a7e6c
+size 64163067
diff --git a/ceph-13.0.0-3535-gaa8868d2d1.tar.bz2 b/ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
deleted file mode 100644
index b3f007d..0000000
--- a/ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48408330f7d54e0545a11bc7c288ebe1ff3e8511b1521105a2d0d1d8901c15c3
-size 64168560
diff --git a/ceph-test.spec b/ceph-test.spec
index 140887e..83417d5 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -26,6 +26,7 @@
 %bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_with lowmem_builder
+%global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
 %bcond_with selinux
@@ -34,7 +35,7 @@
 %bcond_without lowmem_builder
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-%define _fillupdir /var/adm/fillup-templates
+%global _fillupdir /var/adm/fillup-templates
 %endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
@@ -67,7 +68,7 @@
 #################################################################################
 Name: ceph-test
 Version: 13.0.0
-Release: 3535.gaa8868d2d1%{?dist}
+Release: 3535.g8b10d08c04%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
 %endif
@@ -82,11 +83,8 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-%if 0%{?fedora} || 0%{?rhel}
-Source: https://download.ceph.com/tarballs/ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
-%endif
+Source0: %{?_remote_tarball_prefix}ceph-13.0.0-3535-g8b10d08c04.tar.bz2
 %if 0%{?suse_version}
-Source0: ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
 Source96: checkin.sh
 Source97: README-checkin.txt
 Source98: README-ceph-test.txt
@@ -366,7 +364,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-13.0.0-3535-gaa8868d2d1
+%autosetup -p1 -n ceph-13.0.0-3535-g8b10d08c04
 
 %build
 %if 0%{with cephfs_java}
diff --git a/ceph.spec b/ceph.spec
index 8a586e4..4ba7242 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,6 +26,7 @@
 %bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_with lowmem_builder
+%global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
 %bcond_with selinux
@@ -34,7 +35,7 @@
 %bcond_without lowmem_builder
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+%global _fillupdir /var/adm/fillup-templates
 %endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
@@ -67,7 +68,7 @@
 #################################################################################
 Name:		ceph
 Version:	13.0.0
-Release:	3535.gaa8868d2d1%{?dist}
+Release:	3535.g8b10d08c04%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -82,11 +83,8 @@ License:	LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-%if 0%{?fedora} || 0%{?rhel}
-Source:		https://download.ceph.com/tarballs/ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
-%endif
+Source0:	%{?_remote_tarball_prefix}ceph-13.0.0-3535-g8b10d08c04.tar.bz2
 %if 0%{?suse_version}
-Source0:	ceph-13.0.0-3535-gaa8868d2d1.tar.bz2
 # _insert_obs_source_lines_here
 %if 0%{?is_opensuse}
 ExclusiveArch:  x86_64 aarch64 ppc64 ppc64le
@@ -794,7 +792,7 @@ python-rbd, python-rgw or python-cephfs instead.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-13.0.0-3535-gaa8868d2d1
+%autosetup -p1 -n ceph-13.0.0-3535-g8b10d08c04
 
 %build
 %if 0%{with cephfs_java}