diff --git a/www/py-urlwatch/Makefile b/www/py-urlwatch/Makefile
index bd80137ebd02..c3a738aeae7f 100644
--- a/www/py-urlwatch/Makefile
+++ b/www/py-urlwatch/Makefile
@@ -1,32 +1,53 @@
 PORTNAME=	urlwatch
-DISTVERSION=	2.18
+DISTVERSION=	2.23
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Monitors webpages and sends notifications about changes
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}minidb>0:databases/py-minidb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pdftotext>0:textproc/py-pdftotext@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jq>0:textproc/py-jq@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytesseract>0:graphics/py-pytesseract@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
 
-USES=		python:3.3+
+USES=		python:3.6+
+USE_LOCALE=	en_US.UTF-8
 USE_PYTHON=	autoplist concurrent distutils
 
+BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=		DOCS
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_PORTDOCS=		html/* text/*
+DOCS_VARS=		USES+=gmake
+
+post-build-DOCS-on:
+		cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -j${MAKE_JOBS_NUMBER} html text
+
+post-install-DOCS-on:
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/text
+		(cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} "! -name .buildinfo")
+		(cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR})
+
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
+		cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/www/py-urlwatch/distinfo b/www/py-urlwatch/distinfo
index 09ecc83338d8..fdf27ee6d99f 100644
--- a/www/py-urlwatch/distinfo
+++ b/www/py-urlwatch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588622178
-SHA256 (urlwatch-2.18.tar.gz) = b556d1176683f0b7058d7bd34cddfdadbc86ab9551fe5e674aaf55c89696bd9d
-SIZE (urlwatch-2.18.tar.gz) = 48268
+TIMESTAMP = 1621674523
+SHA256 (urlwatch-2.23.tar.gz) = 73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
+SIZE (urlwatch-2.23.tar.gz) = 137917