diff --git a/devel/Makefile b/devel/Makefile
index d5f702289da9..2b50b6533a94 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4088,6 +4088,7 @@
     SUBDIR += py-atomicwrites
     SUBDIR += py-atpublic
     SUBDIR += py-attrs
+    SUBDIR += py-autocommand
     SUBDIR += py-autoflake
     SUBDIR += py-automaton
     SUBDIR += py-autoprop
diff --git a/devel/py-autocommand/Makefile b/devel/py-autocommand/Makefile
new file mode 100644
index 000000000000..d6b4c5b07ee2
--- /dev/null
+++ b/devel/py-autocommand/Makefile
@@ -0,0 +1,21 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	autocommand
+PORTVERSION=	2.2.1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Create a command-line program from a function
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		python:3.3+
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-autocommand/distinfo b/devel/py-autocommand/distinfo
new file mode 100644
index 000000000000..639d5f3adbbb
--- /dev/null
+++ b/devel/py-autocommand/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1612101542
+SHA256 (autocommand-2.2.1.tar.gz) = fed420e9d02745821a782971b583c6970259ee0b229be2a0a401e1467a4f170f
+SIZE (autocommand-2.2.1.tar.gz) = 23151
diff --git a/devel/py-autocommand/pkg-descr b/devel/py-autocommand/pkg-descr
new file mode 100644
index 000000000000..325ff0d3f062
--- /dev/null
+++ b/devel/py-autocommand/pkg-descr
@@ -0,0 +1,4 @@
+autocommand is a library to automatically generate and run simple argparse
+parsers from function signatures.
+
+WWW: https://github.com/Lucretiel/autocommand