diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 725b0cb49f32..9a9457bdcf2b 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	automake
 PORTVERSION=	1.16.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator
 WWW=		https://www.gnu.org/software/automake/
 
 LICENSE=	GPLv2+ GFDL
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
 
 BUILD_DEPENDS=	autoconf>=2.69:devel/autoconf
 RUN_DEPENDS=	autoconf>=2.69:devel/autoconf
 
 BUILD_VERSION=	1.16
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USES=		cpe perl5 tar:xz
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INFO=		automake automake-history
 CPE_VENDOR=	gnu
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/devel/automake/files/patch-m4_python.m4 b/devel/automake/files/patch-m4_python.m4
new file mode 100644
index 000000000000..0230c1d9a9a5
--- /dev/null
+++ b/devel/automake/files/patch-m4_python.m4
@@ -0,0 +1,16 @@
+--- m4/python.m4.orig	2021-10-04 02:51:12 UTC
++++ m4/python.m4
+@@ -37,9 +37,12 @@ AC_DEFUN([AM_PATH_PYTHON],
+   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
+   dnl supported. (2.0 was released on October 16, 2000).
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-[python python2 python3 dnl
++[python python3 dnl
++ python3.20 python3.19 python3.18 python3.17 python3.16 dnl
++ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
+  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
+  python3.2 python3.1 python3.0 dnl
++ python2 dnl
+  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
+  python2.0])
+