diff --git a/diffutils.changes b/diffutils.changes
index 7cbf5c0..8749377 100644
--- a/diffutils.changes
+++ b/diffutils.changes
@@ -1,10 +1,9 @@
 -------------------------------------------------------------------
 Mon Aug 31 10:02:12 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
 
-- gnulib-test-avoid-FP-perror-strerror.patch: Add patch to
-avoid false-positive error in gnulib tests 'test-perror2' and
-'test-strerror_r', visible on armv7l.
-- diffutils.spec: Reference the patch.
+- gnulib-test-avoid-FP-perror-strerror.patch: avoid false-positive
+  error in gnulib tests 'test-perror2' and 'test-strerror_r',
+  visible on armv7l.
 
 -------------------------------------------------------------------
 Thu Sep 19 11:51:54 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
diff --git a/diffutils.spec b/diffutils.spec
index d6ec3f6..84ab8cc 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -26,10 +26,7 @@ URL:            https://www.gnu.org/software/diffutils/
 Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
-
-# Avoid FP error in gnulib tests 'test-perror2' and 'test-strerror_r'.
-Patch1:         gnulib-test-avoid-FP-perror-strerror.patch
-
+Patch0:         gnulib-test-avoid-FP-perror-strerror.patch
 Requires(pre):  %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
 Provides:       diff = %{version}
@@ -42,8 +39,7 @@ make source code patches, for instance.
 %lang_package
 
 %prep
-%setup -q
-%patch1
+%autosetup -p1
 
 %build
 %configure \
diff --git a/gnulib-test-avoid-FP-perror-strerror.patch b/gnulib-test-avoid-FP-perror-strerror.patch
index 482a45d..3d6d004 100644
--- a/gnulib-test-avoid-FP-perror-strerror.patch
+++ b/gnulib-test-avoid-FP-perror-strerror.patch
@@ -71,10 +71,8 @@ This downstream patch is identical to upstream one modulo the ChangeLog entry.
  gnulib-tests/test-strerror_r.c |    3 ---
  2 files changed, 6 deletions(-)
 
-Index: gnulib-tests/test-perror2.c
-===================================================================
---- gnulib-tests/test-perror2.c.orig
-+++ gnulib-tests/test-perror2.c
+--- a/gnulib-tests/test-perror2.c
++++ b/gnulib-tests/test-perror2.c
 @@ -79,9 +79,6 @@ main (void)
      errno = -5;
      perror ("");
@@ -85,10 +83,8 @@ Index: gnulib-tests/test-perror2.c
      ASSERT (STREQ (msg4, str4));
  
      free (str1);
-Index: gnulib-tests/test-strerror_r.c
-===================================================================
---- gnulib-tests/test-strerror_r.c.orig
-+++ gnulib-tests/test-strerror_r.c
+--- a/gnulib-tests/test-strerror_r.c
++++ b/gnulib-tests/test-strerror_r.c
 @@ -165,9 +165,6 @@ main (void)
  
      strerror_r (EACCES, buf, sizeof buf);