diff --git a/elfutils.spec b/elfutils.spec
index 234a1f6..ef013b1 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package elfutils
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -183,12 +183,12 @@ rm -f %{buildroot}/%{_libdir}/*.la
 ls -lR %{buildroot}/%{_libdir}/libelf*
 %find_lang %{name}
 
-install -Dm0644 config/debuginfod.service ${RPM_BUILD_ROOT}%{_unitdir}/debuginfod.service
+install -Dm0644 config/debuginfod.service ${buildroot}%{_unitdir}/debuginfod.service
 install -d -m 755 %{buildroot}%{_fillupdir}
 cp config/debuginfod.sysconfig %{buildroot}%{_fillupdir}/sysconfig.debuginfod
 
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/debuginfod
-touch ${RPM_BUILD_ROOT}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite
+mkdir -p ${buildroot}%{_localstatedir}/cache/debuginfod
+touch ${buildroot}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite
 
 %post -n libasm1 -p /sbin/ldconfig
 %post -n libelf1 -p /sbin/ldconfig
@@ -293,7 +293,7 @@ export XFAIL_TESTS="dwfl-proc-attach run-backtrace-dwarf.sh run-backtrace-native
 
 %pre -n debuginfod
 getent group debuginfod >/dev/null || %{_sbindir}/groupadd -r debuginfod
-getent passwd debuginfod >/dev/null || %{_sbindir}/useradd -r -g debuginfod -d /var/cache/debuginfod -s /bin/false -c "elfutils debuginfo server" debuginfod
+getent passwd debuginfod >/dev/null || %{_sbindir}/useradd -r -g debuginfod -d %{_localstatedir}/cache/debuginfod -s /bin/false -c "elfutils debuginfo server" debuginfod
 %service_add_pre debuginfod.service
 
 %post -n debuginfod