diff --git a/product-builder.changes b/product-builder.changes
index c9f841d..e931c80 100644
--- a/product-builder.changes
+++ b/product-builder.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 28 16:49:07 UTC 2017 - jengelh@inai.de
+
+- Stop using old RPM shell vars
+
 -------------------------------------------------------------------
 Tue Apr 11 14:57:20 UTC 2017 - adrian@suse.de
 
diff --git a/product-builder.spec b/product-builder.spec
index 61ce266..1f4048d 100644
--- a/product-builder.spec
+++ b/product-builder.spec
@@ -62,14 +62,14 @@ and SLE 12.
 
 %build
 test -e /.buildenv && . /.buildenv
-make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
+make buildroot="%{buildroot}" CFLAGS="%{optflags}"
 
 %install
-make buildroot=$RPM_BUILD_ROOT \
-    doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \
-    man_prefix=$RPM_BUILD_ROOT/%{_mandir} \
+make buildroot="%{buildroot}" \
+    doc_prefix="%{buildroot}/%{_defaultdocdir}" \
+    man_prefix="%{buildroot}/%{_mandir}" \
     install
-./.version > $RPM_BUILD_ROOT%{_datadir}/kiwi/.revision
+./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
 
 %files
 %defattr(-, root, root)