diff --git a/radvd.spec b/radvd.spec
index 781eea5..22f2e45 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -46,22 +46,22 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIE"
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
 %configure \
     --disable-silent-rules \
-    --with-pidfile=%{_localstatedir}/run/radvd/radvd.pid
+    --with-pidfile=/run/radvd/radvd.pid
 make %{?_smp_mflags} 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/radvd
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}/run/radvd
+mkdir -p %{buildroot}%{_unitdir}
 
-install -m 644 redhat/radvd.conf.empty $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf
-install -m 644 redhat/radvd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/radvd
+install -m 644 redhat/radvd.conf.empty %{buildroot}%{_sysconfdir}/radvd.conf
+install -m 644 redhat/radvd.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/radvd
 
-install -d -m 755 $RPM_BUILD_ROOT%{_tmpfilesdir}
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/radvd.conf
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_unitdir}
+install -d -m 755 %{buildroot}%{_tmpfilesdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/radvd.conf
+install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
 
 %check
 # The tests don't work, see https://github.com/reubenhwk/radvd/issues/30