diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index ad55529a1428..54b42e184e1f 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cutadapt
-PORTVERSION=	1.18
+DISTVERSION=	2.1
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,13 +12,19 @@ COMMENT=	Trim adapters from high-throughput sequencing reads
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xopen>=0.3.2:archivers/py-xopen@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}bz2file>=0.98:archivers/py-bz2file@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xopen>=0.5.0:archivers/py-xopen@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dnaio>=0.3:biology/py-dnaio@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR}
 
 USES=		python:3.4+
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent cython distutils
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cutadapt/*.so
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
+
 .include <bsd.port.mk>
diff --git a/biology/py-cutadapt/distinfo b/biology/py-cutadapt/distinfo
index 11a0fb6618e8..5baafb03d6d7 100644
--- a/biology/py-cutadapt/distinfo
+++ b/biology/py-cutadapt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536508727
-SHA256 (cutadapt-1.18.tar.gz) = 17aabf9b19d09a426d96030a83ad003c97b26dba9d45bf5570d33088fcd533f9
-SIZE (cutadapt-1.18.tar.gz) = 342050
+TIMESTAMP = 1553346146
+SHA256 (cutadapt-2.1.tar.gz) = 09fd222a27cc1eeb571633f2bd54442ea9d4ff668ef1f475fd9d5253a7d315ef
+SIZE (cutadapt-2.1.tar.gz) = 264993