diff --git a/productivity/khard/Makefile b/productivity/khard/Makefile
index 509902270ef..eabdf28aa33 100644
--- a/productivity/khard/Makefile
+++ b/productivity/khard/Makefile
@@ -1,51 +1,45 @@
-COMMENT =		console vCard address book
+COMMENT=	console vCard address book
 
-MODPY_DISTV =	0.19.1
-DISTNAME =		khard-${MODPY_DISTV}
-REVISION =		3
+MODPY_DISTV=	0.20.1
+DISTNAME=	khard-${MODPY_DISTV}
 
-CATEGORIES =		productivity
+CATEGORIES=	productivity
 
-HOMEPAGE =		https://github.com/lucc/khard
+HOMEPAGE=	https://github.com/lucc/khard
 
 # GPLv3
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
+MODULES=	lang/python
+MODPY_PYBUILD=	setuptools_scm
+MODPY_PI=	Yes
 
-MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools_scm
+RUN_DEPENDS=	devel/py-configobj \
+		textproc/py-ruamel.yaml \
+		textproc/py-unidecode \
+		textproc/py-vobject
 
-BUILD_DEPENDS =		textproc/py-sphinx \
-			${RUN_DEPENDS}
-
-RUN_DEPENDS =		devel/py-atomicwrites \
-			devel/py-configobj \
-			textproc/py-ruamel.yaml \
-			textproc/py-unidecode \
-			textproc/py-vobject
-
-USE_GMAKE =		Yes
+# for manpage generation
+USE_GMAKE=	Yes
+BUILD_DEPENDS=	textproc/py-sphinx \
+		textproc/py-sphinx-argparse \
+		${RUN_DEPENDS}
 
 post-build:
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 		${MAKE_PROGRAM} -C doc man \
-		SPHINXAPIDOC=${LOCALBASE}/bin/sphinx-apidoc \
 		SPHINXBUILD=${LOCALBASE}/bin/sphinx-build
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/khard
-	cd ${WRKSRC}/doc/source/examples; \
-	${INSTALL_DATA} template.yaml khard.conf.example \
-		${PREFIX}/share/examples/khard
-	${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/khard \
+		${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/{_khard,_email-khard} \
 		${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA_DIR} ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/build/man/khard.1 \
-		${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/man/man5
-	${INSTALL_DATA} ${WRKSRC}/doc/build/man/khard.conf.5 \
-		${PREFIX}/man/man5
+	cd ${WRKSRC}/doc/source/examples; \
+		${INSTALL_DATA} template.yaml khard.conf.example \
+		    ${PREFIX}/share/examples/khard
+	cd ${WRKSRC}/doc/build/man; \
+		${INSTALL_DATA} khard*.1 ${PREFIX}/man/man1; \
+		${INSTALL_DATA} khard.conf.5 ${PREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/productivity/khard/distinfo b/productivity/khard/distinfo
index 1207c241093..c5ad3ac52f8 100644
--- a/productivity/khard/distinfo
+++ b/productivity/khard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (khard-0.19.1.tar.gz) = WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA=
-SIZE (khard-0.19.1.tar.gz) = 605230
+SHA256 (khard-0.20.1.tar.gz) = s+W/rfa11+jxaNDDIMdLlU5NDvQZSyh5EUD+V3pI+Ug=
+SIZE (khard-0.20.1.tar.gz) = 611619
diff --git a/productivity/khard/patches/patch-doc_source_conf_py b/productivity/khard/patches/patch-doc_source_conf_py
index 473e0bd2360..59d693f7fe6 100644
--- a/productivity/khard/patches/patch-doc_source_conf_py
+++ b/productivity/khard/patches/patch-doc_source_conf_py
@@ -1,18 +1,20 @@
-we only build manpages here; remove sphinx extensions, not currently in
-ports, needed for API docs but not manpages
-
 Index: doc/source/conf.py
 --- doc/source/conf.py.orig
 +++ doc/source/conf.py
-@@ -48,11 +48,9 @@ del update_template_file
+@@ -48,11 +48,11 @@ del update_template_file
  # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
  # ones.
  extensions = [
 -    'autoapi.extension',  # https://sphinx-autoapi.readthedocs.io/en/latest/
-     'sphinx.ext.autodoc',  # https://pypi.org/project/sphinx-autodoc-typehints/
-     'sphinx.ext.autosectionlabel',
-     'sphinx.ext.todo',
+-    'sphinx.ext.autodoc',  # https://pypi.org/project/sphinx-autodoc-typehints/
+-    'sphinx.ext.autosectionlabel',
+-    'sphinx.ext.todo',
 -    'sphinx_autodoc_typehints',  # https://pypi.org/project/sphinx-autodoc-typehints/
++    #'autoapi.extension',  # https://sphinx-autoapi.readthedocs.io/en/latest/
++    #'sphinx.ext.autodoc',  # https://pypi.org/project/sphinx-autodoc-typehints/
++    #'sphinx.ext.autosectionlabel',
++    #'sphinx.ext.todo',
++    #'sphinx_autodoc_typehints',  # https://pypi.org/project/sphinx-autodoc-typehints/
+     'sphinxarg.ext',
  ]
  
- autoapi_type = 'python'
diff --git a/productivity/khard/pkg/PLIST b/productivity/khard/pkg/PLIST
index 47b1ec757b9..87767ea906c 100644
--- a/productivity/khard/pkg/PLIST
+++ b/productivity/khard/pkg/PLIST
@@ -19,12 +19,14 @@ lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}actions.${MODPY_P
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}address_book.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}address_book.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}carddav_object.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}carddav_object.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}contacts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}contacts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}khard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -35,12 +37,13 @@ lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}version.${MODPY_P
 lib/python${MODPY_VERSION}/site-packages/khard/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/khard/actions.py
 lib/python${MODPY_VERSION}/site-packages/khard/address_book.py
-lib/python${MODPY_VERSION}/site-packages/khard/carddav_object.py
 lib/python${MODPY_VERSION}/site-packages/khard/cli.py
 lib/python${MODPY_VERSION}/site-packages/khard/config.py
+lib/python${MODPY_VERSION}/site-packages/khard/contacts.py
 lib/python${MODPY_VERSION}/site-packages/khard/data/
 lib/python${MODPY_VERSION}/site-packages/khard/data/config.spec
 lib/python${MODPY_VERSION}/site-packages/khard/data/template.yaml
+lib/python${MODPY_VERSION}/site-packages/khard/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/khard/formatter.py
 lib/python${MODPY_VERSION}/site-packages/khard/helpers/
 lib/python${MODPY_VERSION}/site-packages/khard/helpers/__init__.py
@@ -56,6 +59,7 @@ lib/python${MODPY_VERSION}/site-packages/khard/helpers/typing.py
 lib/python${MODPY_VERSION}/site-packages/khard/khard.py
 lib/python${MODPY_VERSION}/site-packages/khard/query.py
 lib/python${MODPY_VERSION}/site-packages/khard/version.py
+@man man/man1/khard-subcommands.1
 @man man/man1/khard.1
 @man man/man5/khard.conf.5
 share/examples/khard/