diff --git a/libexif.changes b/libexif.changes
index 48a631a..0a397d2 100644
--- a/libexif.changes
+++ b/libexif.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 24 11:36:21 UTC 2018 - jengelh@inai.de
+
+- Remove %__-type macro indirections. Fix SRPM group.
+- Use %_smp_mflags for parallel build.
+- Drop pointless --with-pic (no effect since --disable-static).
+
 -------------------------------------------------------------------
 Wed Jan 17 09:32:25 UTC 2018 - kbabioch@suse.com
 
diff --git a/libexif.spec b/libexif.spec
index b6b1e5e..55ed599 100644
--- a/libexif.spec
+++ b/libexif.spec
@@ -17,27 +17,26 @@
 
 
 Name:           libexif
-BuildRequires:  doxygen
-BuildRequires:  pkg-config
+Version:        0.6.21
+Release:        0
 Url:            http://libexif.sourceforge.net
 Summary:        An EXIF Tag Parsing Library for Digital Cameras
 License:        LGPL-2.1+
-Group:          System/Libraries
-Version:        0.6.21
-Release:        0
+Group:          Development/Libraries/C and C++
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        https://downloads.sourceforge.net/project/libexif/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch0:         libexif-build-date.patch
 Patch1:         CVE-2016-6328.patch
 Patch2:         CVE-2017-7544.patch
+BuildRequires:  doxygen
+BuildRequires:  pkg-config
 
 %define pname libexif12
 
 %define debug_package_requires %{pname} = %{version}-%{release}
 
 %package -n %{pname}
-
 Summary:        An EXIF Tag Parsing Library for Digital Cameras
 Group:          System/Libraries
 Provides:       libexif = %{version}
@@ -66,12 +65,13 @@ digital cameras.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+
 %build
 export CFLAGS="%optflags $(getconf LFS_CFLAGS)"
-%configure --with-pic \
+%configure \
 	--disable-static \
 	--with-doc-dir=%{_docdir}/%{name}
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %check
 make check
@@ -79,7 +79,7 @@ make check
 %install
 %makeinstall
 %find_lang %{name}-12
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.la
 
 %post -n %{pname} -p /sbin/ldconfig