diff --git a/acl.changes b/acl.changes
index 3e05859..fc8d9ce 100644
--- a/acl.changes
+++ b/acl.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Apr 23 09:05:29 UTC 2017 - jengelh@inai.de
+
+- Remove --with-pic that's just for static libraries.
+- Replace %__-type macro indirections.
+  Replace old $RPM_ by their macro equivalents for consistency.
+  Make the macro style consistent across the file again.
+
 -------------------------------------------------------------------
 Mon Apr 17 07:47:47 UTC 2017 - hendrikw@arcor.de
 
diff --git a/acl.spec b/acl.spec
index a582791..4fdf90d 100644
--- a/acl.spec
+++ b/acl.spec
@@ -94,8 +94,8 @@ control lists.
 
 %package -n %lname
 Summary:        A dynamic library for accessing POSIX Access Control Lists
-Group:          System/Libraries
 # bug437293
+Group:          System/Libraries
 %ifarch ppc64
 Obsoletes:      libacl-64bit
 %endif
@@ -110,13 +110,13 @@ control lists.
 
 %package -n libacl-devel
 Summary:        Include Files and Libraries mandatory for Development
-Group:          Development/Libraries/C and C++
 # the .so file references libattr.so.x, so require libattr-devel
+Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 Requires:       glibc-devel
 Requires:       libattr-devel
-Provides:       acl-devel = %{version}
-Obsoletes:      acl-devel < %{version}
+Provides:       acl-devel = %version
+Obsoletes:      acl-devel < %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      libacl-devel-64bit
@@ -168,23 +168,22 @@ to develop applications that require these.
 %build
 chmod a+x po/update-potfiles
 sh autogen.sh
-export OPTIMIZER="$RPM_OPT_FLAGS -fPIC"
+export OPTIMIZER="%optflags -fPIC"
 export DEBUG=-DNDEBUG
-CFLAGS="$RPM_OPT_FLAGS"
+CFLAGS="%optflags"
 
 %ifarch %ix86 i586
-export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
+export CFLAGS="%optflags -D_FILE_OFFSET_BITS=64"
 %endif
 
 %configure \
 	--prefix=/usr \
 	--exec-prefix=/usr \
-	--libdir=/%{_lib} \
-	--libexecdir=/%{_lib} \
+	--libdir=/%_lib \
+	--libexecdir=/%_lib \
 	--disable-static \
-	--docdir=%{_defaultdocdir}/%{name} \
-	--with-pic
-%{__make} %{?_smp_mflags} V=1
+	--docdir=%_defaultdocdir/%name
+make %{?_smp_mflags} V=1
 
 %check
 %if %{with acl_tests}
@@ -198,11 +197,11 @@ export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
 
 %install
 %make_install
-%{__mkdir_p} %buildroot%{_libdir}
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
-%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.{la,so}
+mkdir -p %buildroot/%_libdir
+ln -sv /%_lib/$(readlink %buildroot/%_lib/lib%name.so) %buildroot/%_libdir/lib%name.so
+rm -v %buildroot/%_lib/lib%name.{la,so}
 # The library stays in /lib* but the pkgconfig file needs to go under /usr
-mv -f %{buildroot}/%{_lib}/pkgconfig/ %{buildroot}%{_libdir}
+mv -f %buildroot/%_lib/pkgconfig/ %buildroot/%_libdir
 %find_lang %name
 
 %post -n %lname -p /sbin/ldconfig
@@ -228,6 +227,6 @@ mv -f %{buildroot}/%{_lib}/pkgconfig/ %{buildroot}%{_libdir}
 
 %files -n %lname
 %defattr(755,root,root,755)
-/%{_lib}/libacl.so.1*
+/%_lib/libacl.so.1*
 
 %changelog