diff --git a/devel/py-ciso8601/Makefile b/devel/py-ciso8601/Makefile
index d4bfc172c657..ef7e801f314e 100644
--- a/devel/py-ciso8601/Makefile
+++ b/devel/py-ciso8601/Makefile
@@ -1,19 +1,29 @@
 PORTNAME=	ciso8601
+DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Fast ISO8601 date time parser for Python written in C
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	autoplist distutils
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	closeio
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ciso8601*.so
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v
+
 .include <bsd.port.mk>
diff --git a/devel/py-ciso8601/distinfo b/devel/py-ciso8601/distinfo
index 08fcff0dccca..2e57d0990613 100644
--- a/devel/py-ciso8601/distinfo
+++ b/devel/py-ciso8601/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628312303
-SHA256 (ciso8601-2.2.0.tar.gz) = 14ad817ed31a698372d42afa81b0173d71cd1d0b48b7499a2da2a01dcc8695e6
-SIZE (ciso8601-2.2.0.tar.gz) = 18440
+TIMESTAMP = 1628664654
+SHA256 (closeio-ciso8601-v2.2.0_GH0.tar.gz) = f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+SIZE (closeio-ciso8601-v2.2.0_GH0.tar.gz) = 35209