diff --git a/cad/py-amaranth/Makefile b/cad/py-amaranth/Makefile
index b9ce40a81050..a83a983a9078 100644
--- a/cad/py-amaranth/Makefile
+++ b/cad/py-amaranth/Makefile
@@ -1,55 +1,67 @@
 PORTNAME=	amaranth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.7
+DISTVERSION=	0.5.8
 CATEGORIES=	cad python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Amaranth hardware definition language
 WWW=		https://amaranth-lang.org/docs/amaranth/latest/ \
 		https://github.com/amaranth-lang/amaranth
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-backend>0:devel/py-pdm-backend@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jschon>=0.11.1:devel/py-jschon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyvcd>=0.2.2:cad/py-pyvcd@${PY_FLAVOR}
 TEST_DEPENDS=	sby:cad/symbiyosys \
 		yosys:cad/yosys
 
 USES=		python
-USE_PYTHON=	pep517 autoplist pytest
+USE_PYTHON=	autoplist pep517 pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	amaranth-lang
 
-NO_ARCH=	yes
-
 MAKE_ENV=	PDM_BUILD_SCM_VERSION=${DISTVERSION} # this allows to build from a tarball (otherwise PDM wouldn't be able to determine the version)
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
+NO_ARCH=	yes
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272771
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
 	@${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION:S/-/.post/}*.dist-info/RECORD >> ${_PYTHONPKGLIST}
 	@${REINPLACE_CMD} \
 		-e '/\.pyc$$/d' \
 		-e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../include/|include/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../lib/|lib/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libdata/|libdata/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libexec/|libexec/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../man/|man/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../sbin/|sbin/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../share/|share/|' \
 			${_PYTHONPKGLIST}
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} lib -name '*.pyc' >> ${_PYTHONPKGLIST}
 
+do-install-DOCS-on:
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+
 # tests as of 0.5.6: 1187 passed, 4 warnings in 46.66s
 
 .include <bsd.port.mk>
diff --git a/cad/py-amaranth/distinfo b/cad/py-amaranth/distinfo
index e9580b804794..d01e97e8875a 100644
--- a/cad/py-amaranth/distinfo
+++ b/cad/py-amaranth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753029759
-SHA256 (amaranth-lang-amaranth-v0.5.7_GH0.tar.gz) = 2670e07c7bcebb9fbd444d8b9ef9ba7942b0d51f9a54e6a58a091c6fb0fafa92
-SIZE (amaranth-lang-amaranth-v0.5.7_GH0.tar.gz) = 749105
+TIMESTAMP = 1762685265
+SHA256 (amaranth-lang-amaranth-v0.5.8_GH0.tar.gz) = 97e4aeb78d387c37ef4961013c1a8c3318242cdc394f41627c417d4bcffe6ab5
+SIZE (amaranth-lang-amaranth-v0.5.8_GH0.tar.gz) = 749621