diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 33b810592727d..bfe802a79f3d5 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	watchdog
-PORTVERSION=	0.9.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	0
-CATEGORIES=	devel
+PORTVERSION=	0.10.6
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -13,24 +12,25 @@ COMMENT=	Python API library to monitor file system events
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_GITHUB=	yes
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
-GH_ACCOUNT=	gorakhargosh
-
 NO_ARCH=	yes
 
+PORTDOCS=	*
+
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 
 post-build-DOCS-on:
 	(cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html)
@@ -40,4 +40,7 @@ post-install-DOCS-on:
 	(cd ${WRKSRC}/docs/build/html ; \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests
+
 .include <bsd.port.mk>
diff --git a/devel/py-watchdog/distinfo b/devel/py-watchdog/distinfo
index dd1fdf41a73bb..641d928b08f20 100644
--- a/devel/py-watchdog/distinfo
+++ b/devel/py-watchdog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539444517
-SHA256 (gorakhargosh-watchdog-v0.9.0_GH0.tar.gz) = e8a32701dff43a4e671a40acf92f55a8fffd8ca74333b75436d63a94d104faef
-SIZE (gorakhargosh-watchdog-v0.9.0_GH0.tar.gz) = 90597
+TIMESTAMP = 1612010670
+SHA256 (watchdog-0.10.6.tar.gz) = 1e1ea6d3d74feca5c62393525107aa45c5d4cd15199e2a5f62b1a6ca83679131
+SIZE (watchdog-0.10.6.tar.gz) = 99949