diff --git a/security/py-python-jose/Makefile b/security/py-python-jose/Makefile
index 06b09f77bcd6..1cdd235013ad 100644
--- a/security/py-python-jose/Makefile
+++ b/security/py-python-jose/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	python-jose
 PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,16 +10,23 @@ COMMENT=	Client SDK for TIP API which require Authentication Tokens
 WWW=		https://github.com/mpdavis/python-jose
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rsa>0:security/py-rsa@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>=0:security/py-ecdsa@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}rsa>=0:security/py-rsa@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	CRYPTOGRAPHY PYCRYPTODOME
+OPTIONS_DEFAULT=CRYPTOGRAPHY PYCRYPTODOME
+CRYPTOGRAPHY_DESC=	Use cryptography
+PYCRYPTODOME_DESC=	Use pycryptodome
+
+CRYPTOGRAPHY_USE=		PYTHON=cryptography
+PYCRYPTODOME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.3.1<4.0.0:security/py-pycryptodome@${PY_FLAVOR}
+
 .include <bsd.port.mk>