diff --git a/deskutils/py-khard/Makefile b/deskutils/py-khard/Makefile
index 3d9716ae1fdf..b664bdce4db7 100644
--- a/deskutils/py-khard/Makefile
+++ b/deskutils/py-khard/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	khard
-DISTVERSION=	0.17.0
+DISTVERSION=	0.18.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andreas@bilke.org
 COMMENT=	Console carddav client
-WWW=		https://github.com/scheibler/khard/
+WWW=		https://github.com/lucc/khard/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.21:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-autoapi>0:textproc/py-sphinx-autoapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-autodoc-typehints>0:textproc/py-sphinx-autodoc-typehints@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 
-USES=		python:3.6+ gmake
+USES=		python:3.7+ gmake
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 PLIST_FILES=	share/zsh/site-functions/_khard \
 		share/zsh/site-functions/_email-khard \
 		${EXAMPLESDIR}/khard.conf.example \
 		${EXAMPLESDIR}/template.yaml \
 		man/man1/khard.1.gz \
 		man/man5/khard.conf.5.gz
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|sphinx-build|${LOCALBASE}/bin/sphinx-build-${PYTHON_VER}|g' \
 		-e 's|sphinx-apidoc|${LOCALBASE}/bin/sphinx-apidoc-${PYTHON_VER}|g' \
 		${WRKSRC}/doc/Makefile
 
 do-build:
 	(cd ${WRKSRC}/doc && ${MAKE_CMD} man)
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_khard \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_email-khard \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/doc/source/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-khard/distinfo b/deskutils/py-khard/distinfo
index 558680e43619..2efd40f2afd8 100644
--- a/deskutils/py-khard/distinfo
+++ b/deskutils/py-khard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598120736
-SHA256 (khard-0.17.0.tar.gz) = 164e1aee9264735ec0473a74a38842e6272bbb814d949a66084c6a373bd95618
-SIZE (khard-0.17.0.tar.gz) = 593928
+TIMESTAMP = 1671468298
+SHA256 (khard-0.18.0.tar.gz) = fe88d4b47fdd948610ac573c01fa13d1b7996265cbc44391085761af9a030615
+SIZE (khard-0.18.0.tar.gz) = 602016