diff --git a/kexec-tools.changes b/kexec-tools.changes
index 889e25f..3000d0c 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  1 09:12:40 UTC 2017 - jengelh@inai.de
+
+- Remove redundant %clean section. Replace $RPM_* shell vars
+  by macros.
+- Rewrite summary line.
+
 -------------------------------------------------------------------
 Wed May 31 10:47:33 CEST 2017 - tiwai@suse.de
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 96abbb3..412f23f 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -25,7 +25,7 @@ Requires:       perl-Bootloader
 Requires(pre):  %fillup_prereq
 Requires(post): coreutils
 Requires(postun): coreutils
-Summary:        Tools for fast kernel loading
+Summary:        Tools for loading replacement kernels into memory
 License:        GPL-2.0+
 Group:          System/Kernel
 Version:        2.0.14
@@ -162,10 +162,10 @@ the loaded kernel after it panics.
 export SUSE_ASNEEDED=0
 %{?suse_update_config -f}
 %ifarch ia64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
+RPM_OPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-fstack-protector//')
 %endif
 autoreconf -f
-CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \
+CFLAGS="$RPM_OPT_FLAGS" BUILD_CFLAGS="$RPM_OPT_FLAGS" \
 %ifarch ppc
 %configure --host=powerpc64-suse-linux --build=powerpc64-suse-linux 
 %else
@@ -175,22 +175,19 @@ make
 a2x -D . -d manpage -f manpage %{S:2}
 
 %install
-%makeinstall
-install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/kdump.8
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir}
+%make_install
+install -c -m 0644 kexec-bootloader.8 %{buildroot}/%{_mandir}/man8
+rm -f %{buildroot}/%{_mandir}/man8/kdump.8
+mkdir -p %{buildroot}/%{_sbindir}
+install -m 0755 %{S:1} %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}/%{_unitdir}
+install -m644 %{S:3} %{buildroot}/%{_unitdir}
 #UsrMerge
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin
-ln -s %{_sbindir}/kexec $RPM_BUILD_ROOT/sbin
+mkdir -p %{buildroot}/sbin
+ln -s %{_sbindir}/kdump %{buildroot}/sbin
+ln -s %{_sbindir}/kexec %{buildroot}/sbin
 #EndUsrMerge
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
 %post
 %service_add_post kexec-load.service
 %{?regenerate_initrd_post}