diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	Wand
-PORTVERSION=	0.6.7
+DISTVERSION=	0.6.7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	sunpoet@FreeBSD.org
+MAINTAINER=	rsmith@xs4all.nl
 COMMENT=	Ctypes-based simple MagickWand API binding for Python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
+
 NO_ARCH=	yes
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS X11
+OPTIONS_DEFAULT=	X11
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
+
+X11_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+X11_LIB_DEPENDS_OFF=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}-nox11
+
+do-test:
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
-OPTIONS_DEFINE=	X11
-OPTIONS_SINGLE=	IMAGEMAGICK
-OPTIONS_SINGLE_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
-OPTIONS_DEFAULT=IMAGEMAGICK7 X11
-IMAGEMAGICK6_DESC=	Use ImageMagick 6.x (graphics/ImageMagick6*)
-IMAGEMAGICK7_DESC=	Use ImageMagick 7.x (graphics/ImageMagick7*)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-.if ${PORT_OPTIONS:MIMAGEMAGICK7}
-LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
-.else
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
-.endif
-.else
-.if ${PORT_OPTIONS:MIMAGEMAGICK7}
-LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7-nox11
-.else
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6-nox11
-.endif
-.endif
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+		(cd ${WRKSRC}/build/sphinx/html && \
+			${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+					"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>