diff --git a/99bb9048f.patch b/99bb9048f.patch
new file mode 100644
index 0000000..06c3092
--- /dev/null
+++ b/99bb9048f.patch
@@ -0,0 +1,36 @@
+From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@debian.org>
+Date: Thu, 4 Nov 2021 07:37:13 -0300
+Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once
+
+That second call seems to be there since the beginning, and autoconf
+2.69 was fine with it. autoconf 2.71 doesn't allow it anymore:
+
+    $ ./autogen.sh
+    autoreconf: export WARNINGS=
+    autoreconf: Entering directory '.'
+    autoreconf: configure.ac: not using Gettext
+    autoreconf: running: aclocal --force
+    configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times
+    /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
+    configure.ac:19: the top level
+    /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
+    configure.ac:34: the top level
+    autom4te: error: /usr/bin/m4 failed with exit status: 1
+    aclocal: error: /usr/bin/autom4te failed with exit status: 1
+    autoreconf: error: aclocal failed with exit status: 1
+
+Signed-off-by: Antonio Terceiro <terceiro@debian.org>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12c9186..94c5c84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,4 +31,3 @@ AC_FUNC_FORK
+ 
+ AC_CONFIG_FILES([Makefile config.h])
+ AC_OUTPUT
+-AM_INIT_AUTOMAKE
diff --git a/catatonit.changes b/catatonit.changes
index 764654f..6192382 100644
--- a/catatonit.changes
+++ b/catatonit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 25 14:28:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 99bb9048f.patch: configure.ac: call AM_INIT_AUTOMAKE only
+  once. Fix build with autocnf 2.71 / automake 1.16.5.
+
 -------------------------------------------------------------------
 Thu Sep 16 05:16:12 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/catatonit.spec b/catatonit.spec
index 6e8ced1..182db46 100644
--- a/catatonit.spec
+++ b/catatonit.spec
@@ -27,6 +27,7 @@ Source0:        https://github.com/openSUSE/catatonit/releases/download/v%{versi
 Source1:        https://github.com/openSUSE/catatonit/releases/download/v%{version}/%{name}.tar.xz.asc#/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 Source3:        %{name}-rpmlintrc
+Patch0:         https://github.com/openSUSE/catatonit/commit/99bb9048f.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  file
@@ -45,7 +46,7 @@ This is a reimplementation of other container init programs (such as
 signalfd(2)) and has no additional features.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 autoreconf -fi