diff --git a/devel/py-Automat/Makefile b/devel/py-Automat/Makefile
index 97c02e7e6f94..01899173f5fd 100644
--- a/devel/py-Automat/Makefile
+++ b/devel/py-Automat/Makefile
@@ -1,28 +1,30 @@
 PORTNAME=	Automat
-PORTVERSION=	20.2.0
+PORTVERSION=	22.10.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
+PATCH_SITES=	https://github.com/glyph/Automat/commit/
+PATCHFILES=	033cb4e0a41c.patch:-p1  # https://github.com/glyph/automat/pull/150
+
 MAINTAINER=	john@saltant.com
 COMMENT=	Finite-state machines in Python
 WWW=		https://github.com/glyph/Automat
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm7>0:devel/py-setuptools_scm7@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 # Officially: 2.7, 3.5-3.8
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 # Note: We cannot include devel/py-twisted in *_DEPENDS because it depends
 # on us for BUILD and RUN.
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Automat/distinfo b/devel/py-Automat/distinfo
index 87f19bdaddb3..cf5f011b8a91 100644
--- a/devel/py-Automat/distinfo
+++ b/devel/py-Automat/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1593260712
-SHA256 (Automat-20.2.0.tar.gz) = 7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-SIZE (Automat-20.2.0.tar.gz) = 61679
+TIMESTAMP = 1719531499
+SHA256 (Automat-22.10.0.tar.gz) = e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
+SIZE (Automat-22.10.0.tar.gz) = 59099
+SHA256 (033cb4e0a41c.patch) = 5899f43abb83601cb63afef9979e6c9c48cc2d76faea253b84024277692cbe9b
+SIZE (033cb4e0a41c.patch) = 634