diff --git a/kdump-utils.spec b/kdump-utils.spec
index 5914993..e9fb053 100644
--- a/kdump-utils.spec
+++ b/kdump-utils.spec
@@ -92,60 +92,60 @@ fi
 %{SOURCE4} %{_target_cpu} > kdump.conf
 
 %install
-mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/pre.d
-mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/post.d
-mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash
-mkdir -p -m755 $RPM_BUILD_ROOT%{_udevrulesdir}
-mkdir -p -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/kdump
+mkdir -p -m755 %{buildroot}%{_sysconfdir}/kdump/pre.d
+mkdir -p -m755 %{buildroot}%{_sysconfdir}/kdump/post.d
+mkdir -p -m755 %{buildroot}%{_localstatedir}/crash
+mkdir -p -m755 %{buildroot}%{_udevrulesdir}
+mkdir -p -m755 %{buildroot}%{_sharedstatedir}/kdump
 
-install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/kdumpctl
-install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/mkdumprd
-install -D -m 644 kdump.conf $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
-install -D -m 644 kdump.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
-install -D -m 644 %{SOURCE12} %{SOURCE25} -t $RPM_BUILD_ROOT%{_mandir}/man8
-install -D -m 755 %{SOURCE20} %{SOURCE23} %{SOURCE31} -t $RPM_BUILD_ROOT%{_prefix}/lib/kdump
+install -D -m 755 %{SOURCE1} %{buildroot}%{_bindir}/kdumpctl
+install -D -m 755 %{SOURCE7} %{buildroot}%{_sbindir}/mkdumprd
+install -D -m 644 kdump.conf %{buildroot}%{_sysconfdir}/kdump.conf
+install -D -m 644 kdump.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/kdump
+install -D -m 644 %{SOURCE12} %{SOURCE25} -t %{buildroot}%{_mandir}/man8
+install -D -m 755 %{SOURCE20} %{SOURCE23} %{SOURCE31} -t %{buildroot}%{_prefix}/lib/kdump
 %ifarch ppc64 ppc64le
-install -m 755 %{SOURCE32} $RPM_BUILD_ROOT%{_sbindir}/mkfadumprd
-install -m 755 %{SOURCE35} %{SOURCE36} -t $RPM_BUILD_ROOT%{_prefix}/lib/kdump
+install -m 755 %{SOURCE32} %{buildroot}%{_sbindir}/mkfadumprd
+install -m 755 %{SOURCE35} %{SOURCE36} -t %{buildroot}%{_prefix}/lib/kdump
 %endif
 %ifnarch s390x
-install -m 755 %{SOURCE28} $RPM_BUILD_ROOT%{_udevrulesdir}/../kdump-udev-throttler
+install -m 755 %{SOURCE28} %{buildroot}%{_udevrulesdir}/../kdump-udev-throttler
 %endif
 %ifnarch s390x ppc64 ppc64le
 # For s390x the ELF header is created in the kdump kernel and therefore kexec
 # udev rules are not required
-install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules
+install -m 644 %{SOURCE13} %{buildroot}%{_udevrulesdir}/98-kexec.rules
 %endif
 %ifarch ppc64 ppc64le
-install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules
-install -m 755 -D %{SOURCE37} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-fadump.install
+install -m 644 %{SOURCE14} %{buildroot}%{_udevrulesdir}/98-kexec.rules
+install -m 755 -D %{SOURCE37} %{buildroot}%{_prefix}/lib/kernel/install.d/60-fadump.install
 %endif
-install -D -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5
-install -D -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service
-install -m 755 -D %{SOURCE22} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh
-install -m 755 -D %{SOURCE30} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-kdump.install
-install -m 755 -D %{SOURCE33} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/92-crashkernel.install
+install -D -m 644 %{SOURCE15} %{buildroot}%{_mandir}/man5/kdump.conf.5
+install -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/kdump.service
+install -m 755 -D %{SOURCE22} %{buildroot}%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh
+install -m 755 -D %{SOURCE30} %{buildroot}%{_prefix}/lib/kernel/install.d/60-kdump.install
+install -m 755 -D %{SOURCE33} %{buildroot}%{_prefix}/lib/kernel/install.d/92-crashkernel.install
 
 %define dracutdir %{_prefix}/lib/dracut/modules.d
 %define remove_prefix() %(echo -n %2|sed 's/.*%1-//g')
 
 # deal with dracut modules
-mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase
-install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE100}}
-install -m 755 %{SOURCE101} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE101}}
-install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE102}}
-install -m 644 %{SOURCE104} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE104}}
-install -m 644 %{SOURCE106} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE106}}
-install -m 644 %{SOURCE107} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE107}}
+mkdir -p -m755 %{buildroot}/%{dracutdir}/99kdumpbase
+install -m 755 %{SOURCE100} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE100}}
+install -m 755 %{SOURCE101} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE101}}
+install -m 644 %{SOURCE102} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE102}}
+install -m 644 %{SOURCE104} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE104}}
+install -m 644 %{SOURCE106} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE106}}
+install -m 644 %{SOURCE107} %{buildroot}/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE107}}
 
-mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump
-install -m 755 %{SOURCE108} $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump/%{remove_prefix dracut %{SOURCE108}}
-install -m 755 %{SOURCE109} $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump/%{remove_prefix dracut-early-kdump %{SOURCE109}}
+mkdir -p -m755 %{buildroot}/%{dracutdir}/99earlykdump
+install -m 755 %{SOURCE108} %{buildroot}/%{dracutdir}/99earlykdump/%{remove_prefix dracut %{SOURCE108}}
+install -m 755 %{SOURCE109} %{buildroot}/%{dracutdir}/99earlykdump/%{remove_prefix dracut-early-kdump %{SOURCE109}}
 
 %ifarch ppc64 ppc64le
-mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit
-install -m 755 %{SOURCE200} $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE200}}
-install -m 755 %{SOURCE201} $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE201}}
+mkdir -p -m755 %{buildroot}/%{dracutdir}/99zz-fadumpinit
+install -m 755 %{SOURCE200} %{buildroot}/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE200}}
+install -m 755 %{SOURCE201} %{buildroot}/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE201}}
 %endif
 
 %post
diff --git a/makedumpfile.spec b/makedumpfile.spec
index 7cd9ad3..b8b6839 100644
--- a/makedumpfile.spec
+++ b/makedumpfile.spec
@@ -43,10 +43,10 @@ tar -z -x -v -f %{SOURCE1}
 
 %install
 %make_install
-install -m 644 -D makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
-rm $RPM_BUILD_ROOT/%{_sbindir}/makedumpfile-R.pl
+install -m 644 -D makedumpfile.conf %{buildroot}/%{_sysconfdir}/makedumpfile.conf.sample
+rm %{buildroot}/%{_sbindir}/makedumpfile-R.pl
 
-install -m 755 -D eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+install -m 755 -D eppic_makedumpfile.so %{buildroot}/%{_libdir}/eppic_makedumpfile.so
 
 %files
 %{_sbindir}/makedumpfile