diff --git a/libpng16.changes b/libpng16.changes
index e3cd355..4e0dfb2 100644
--- a/libpng16.changes
+++ b/libpng16.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  6 06:43:17 UTC 2021 - pgajdos@suse.com
+
+- install rpm macros in %{_rpmmacrodir} [bsc#1185661]
+- call spec-cleaner
+
 -------------------------------------------------------------------
 Thu Mar 11 13:26:15 UTC 2021 - Lubos Lunak <l.lunak@centrum.cz>
 
diff --git a/libpng16.spec b/libpng16.spec
index d98a705..3f78a75 100644
--- a/libpng16.spec
+++ b/libpng16.spec
@@ -18,7 +18,6 @@
 
 %define debug_build 0
 %define asan_build  0
-
 %define major   1
 %define minor   6
 %define micro   37
@@ -111,17 +110,17 @@ export CFLAGS="$CFLAGS -Og"
 sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \
        -e 's/\(^LIBS =.*\)/\1 -lasan/' Makefile
 %endif
-make %{?_smp_mflags}
+%make_build
 
 %check
-make -j1 check
+%make_build -j1 check
 
 %install
 %make_install
+#find %{buildroot} -type f -name "*.la" -delete -print
 rm %{buildroot}/%{_libdir}/libpng*.la
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp -a %{SOURCE3} \
-      %{buildroot}%{_sysconfdir}/rpm/macros.libpng-tools
+install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools
 %if %{debug_build} ||%{asan_build}
 install -m755 .libs/pngcp %{buildroot}/%{_bindir}
 %endif
@@ -137,16 +136,17 @@ install -m755 .libs/pngcp %{buildroot}/%{_bindir}
 %{_includedir}/libpng%{branch}
 %{_libdir}/libpng%{branch}.so
 %{_libdir}/pkgconfig/libpng%{branch}.pc
-%doc CHANGES README TODO ANNOUNCE LICENSE libpng-*.txt
+%license LICENSE
+%doc CHANGES README TODO ANNOUNCE libpng-*.txt
 
 %files compat-devel
 %{_bindir}/libpng-config
 %{_includedir}/*.h
 %{_libdir}/libpng.so
 %{_libdir}/pkgconfig/libpng.pc
-%{_mandir}/man3/libpng.3%{ext_man}
-%{_mandir}/man3/libpngpf.3%{ext_man}
-%{_mandir}/man5/png.5%{ext_man}
+%{_mandir}/man3/libpng.3%{?ext_man}
+%{_mandir}/man3/libpngpf.3%{?ext_man}
+%{_mandir}/man5/png.5%{?ext_man}
 
 %files tools
 %{_bindir}/png-fix-itxt
@@ -154,6 +154,6 @@ install -m755 .libs/pngcp %{buildroot}/%{_bindir}
 %if %{debug_build} || %{asan_build}
 %{_bindir}/pngcp
 %endif
-%{_sysconfdir}/rpm/macros.libpng-tools
+%{_rpmmacrodir}/macros.libpng-tools
 
 %changelog