diff --git a/.gitignore b/.gitignore
index 5ac295b..ebc04c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 redhat-rpm-config-9.1.0.tar.bz2
+/config.guess
+/config.sub
diff --git a/redhat-rpm-config-9.1.0-configfoo.patch b/redhat-rpm-config-9.1.0-configfoo.patch
new file mode 100644
index 0000000..495f39c
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-configfoo.patch
@@ -0,0 +1,13 @@
+diff -up redhat-rpm-config-9.1.0/macros.configfoo redhat-rpm-config-9.1.0/macros
+--- redhat-rpm-config-9.1.0/macros.configfoo	2013-04-22 13:42:25.984613491 +0300
++++ redhat-rpm-config-9.1.0/macros	2013-04-22 13:43:27.053420367 +0300
+@@ -33,6 +33,9 @@
+   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+   LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
++  for i in $(find . -name config.guess -o -name config.sub) ; do \
++      [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
++  done ; \
+   %{_configure} --build=%{_build} --host=%{_host} \\\
+ 	--program-prefix=%{?_program_prefix} \\\
+ 	--disable-dependency-tracking \\\
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index b6b39a5..8f0f820 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 41%{?dist}
+Release: 42%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -15,6 +15,10 @@ Source: redhat-rpm-config-%{version}.tar.bz2
 Source1: redhat-hardened-cc1
 Source2: redhat-hardened-ld
 
+# up-to-date copies of config.guess and config.sub (from automake 1.13.1)
+Source10: config.guess
+Source11: config.sub
+
 Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
 Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
 Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch
@@ -47,6 +51,8 @@ Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
 Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=951669
 Patch18: redhat-rpm-config-9.1.0-record-switches.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=951442
+Patch19: redhat-rpm-config-9.1.0-configfoo.patch
 BuildArch: noarch
 Requires: coreutils
 Requires: perl-srpm-macros
@@ -54,7 +60,6 @@ Requires: rpm >= 4.8.0
 Requires: dwz >= 0.4
 Requires: zip
 Provides: system-rpm-config = %{version}-%{release}
-BuildRequires: libtool
 
 %description
 Red Hat specific rpm configuration files.
@@ -80,13 +85,14 @@ Red Hat specific rpm configuration files.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
-cp -p %{_datadir}/libtool/config/config.{guess,sub} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat/
 install -m 0444 %{SOURCE1} %{SOURCE2} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
+install -m 0775 %{SOURCE10} %{SOURCE11} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
 find ${RPM_BUILD_ROOT} -name \*.orig -delete
 # buggy makefile in 9.1.0 leaves changelog in wrong place
 find ${RPM_BUILD_ROOT} -name ChangeLog -delete
@@ -101,6 +107,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-42
+- Switch back to manual config.guess/sub copies for reproducability
+- Replace config.guess/sub from %%configure again (#951442)
+
 * Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-41
 - Add -grecord-gcc-switches to global CFLAGS (#951669)
 
diff --git a/sources b/sources
index 46b2fdf..2466718 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-3b71c9d0ccc938989778e3c3892e6b94  redhat-rpm-config-9.1.0.tar.bz2
+9c01fa8c4554cb2c7b92c95dfa0dbfcf  config.guess
+1803a1d601bcf4debccfe2902c4f0f65  config.sub