diff --git a/Makefile b/Makefile
index 49bf944..8b569ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,31 @@
 PORTNAME=	Wand
-PORTVERSION=	0.4.5
+PORTVERSION=	0.6.7
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	python@FreeBSD.org
+MAINTAINER=	rsmith@xs4all.nl
 COMMENT=	MagickWand Python binding
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
+PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_VARS=	PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
-PYDISTUTILS_INSTALLARGS+=	--install-data ${DATADIR}
+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.post.mk>
+.include <bsd.port.mk>
diff --git a/distinfo b/distinfo
index 35e4f33..4d082b0 100644
--- a/distinfo
+++ b/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542296080
-SHA256 (Wand-0.4.5.tar.gz) = b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65
-SIZE (Wand-0.4.5.tar.gz) = 65854
+TIMESTAMP = 1631968670
+SHA256 (Wand-0.6.7.tar.gz) = ebc01bccc25dba68414ab55b482341f9ad2b197d7f49d5e724f339bbf63fb6db
+SIZE (Wand-0.6.7.tar.gz) = 11686093
diff --git a/files/patch-setup.py b/files/patch-setup.py
deleted file mode 100644
index 1e1c24f..0000000
--- a/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2016-10-22 05:27:48 UTC
-+++ setup.py
-@@ -35,7 +35,6 @@ else:
- setup(
-     name='Wand',
-     packages=['wand'],
--    data_files=[('', ['README.rst'])],
-     version=VERSION,
-     description='Ctypes-based simple MagickWand API binding for Python',
-     long_description=readme(),