diff --git a/automake.spec b/automake.spec
index 7cab001..e623d37 100644
--- a/automake.spec
+++ b/automake.spec
@@ -63,8 +63,6 @@ BuildRequires: python2-virtualenv lzip
 %endif
 %endif
 
-
-
 # remove bogus Automake perl dependencies and provides
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
@@ -77,19 +75,19 @@ You should install Automake if you are developing software and would
 like to use its ability to automatically generate GNU standard
 Makefiles.
 
+
 %prep
 %autosetup -p1
 %if %{with check} && %{with automake_enables_optional_test}
 autoreconf -iv
 %endif
 
-file=`find -name config.sub | head -1`
-cp %{SOURCE2} $file
-file=`find -name config.guess | head -1`
-cp %{SOURCE3} $file
+for file in %SOURCE2 %SOURCE3; do
+    for dest in $(find -name "$(basename "$file")"); do
+        cp "$file" "$dest"
+    done
+done
 
-# Fedora only to add ppc64p7 (Power7 optimized) arch:
-perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub
 
 %build
 # disable replacing config.guess and config.sub from redhat-rpm-config
@@ -99,9 +97,11 @@ make %{?_smp_mflags}
 cp m4/acdir/README README.aclocal
 cp contrib/multilib/README README.multilib
 
+
 %install
 make install DESTDIR=%{buildroot}
 
+
 %check
 # %%global TESTS_FLAGS t/preproc-errmsg t/preproc-basics
 %if %{with check}
@@ -109,6 +109,7 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
     || ( cat ./test-suite.log && false )
 %endif
 
+
 %post
 /sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir || :
 
@@ -117,6 +118,7 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir || :
 fi
 
+
 %files
 %doc AUTHORS README THANKS NEWS README.aclocal README.multilib COPYING*
 %doc %{_pkgdocdir}/amhello-1.0.tar.gz
@@ -128,9 +130,13 @@ fi
 %{_datadir}/aclocal-%{api_version}
 %{_mandir}/man1/*
 
+
 %changelog
-* Tue May 08 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-3
+* Wed May 09 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-3
 - update config.{guess,sub} to gnuconfig git HEAD
+- drop ppc64p7 hack in config.sub, it's not needed - per:
+  https://lists.fedoraproject.org/archives/list/
+  devel@lists.fedoraproject.org/thread/2OWD2QRDFBEC6HTPVQ7FMJENH32BWT54/
 
 * Wed Mar 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.16.1-2
 - Update Python 2 dependency declarations to new packaging standards