diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 76e2e6f0f7c9..b76310bdafff 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -1,33 +1,27 @@
 PORTNAME=	icalendar
-PORTVERSION=	4.0.3
-PORTREVISION=	2
+PORTVERSION=	6.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	jun-g@daemonfreaks.com
+MAINTAINER=	sunpoet@FreeeBSD.org
 COMMENT=	Parser and generator of iCalender files for Python
-WWW=		https://github.com/collective/icalendar
+WWW=		https://icalendar.readthedocs.io/en/latest/ \
+		https://github.com/collective/icalendar
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
 
-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python:3.9+ shebangfix
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
-PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}/
-
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+SHEBANG_FILES=	src/icalendar/cli.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-icalendar/distinfo b/devel/py-icalendar/distinfo
index 8f09fb88c93a..fe32401d91dd 100644
--- a/devel/py-icalendar/distinfo
+++ b/devel/py-icalendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545839169
-SHA256 (icalendar-4.0.3.tar.gz) = 07c2447a1d44cbb27c90b8c6a5c98e890cc1853c6223e2a52195cddec26c6356
-SIZE (icalendar-4.0.3.tar.gz) = 77899
+TIMESTAMP = 1734457047
+SHA256 (icalendar-6.1.0.tar.gz) = 43c2db8632959d634f4e48f6e6131e706bf2cdddad488cf0b72fda079b796bad
+SIZE (icalendar-6.1.0.tar.gz) = 142307
diff --git a/devel/py-icalendar/files/patch-src_icalendar_cli.py b/devel/py-icalendar/files/patch-src_icalendar_cli.py
deleted file mode 100644
index f3cb8f58edb0..000000000000
--- a/devel/py-icalendar/files/patch-src_icalendar_cli.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/icalendar/cli.py.orig	2018-06-20 12:52:55 UTC
-+++ src/icalendar/cli.py
-@@ -86,6 +86,7 @@ def main():
-     # This seems a bit of an overkill now, but we will probably add more
-     # functionality later, e.g., iCalendar to JSON / YAML and vice versa.
-     subparsers = parser.add_subparsers(dest='subcommand')
-+    subparsers.required = True
- 
-     subparser = subparsers.add_parser(
-         'view', description=view.__doc__.split('\n\n')[0])