diff --git a/productivity/vdirsyncer/Makefile b/productivity/vdirsyncer/Makefile
index 8d15037544d..b3b5fe14907 100644
--- a/productivity/vdirsyncer/Makefile
+++ b/productivity/vdirsyncer/Makefile
@@ -1,8 +1,7 @@
 COMMENT =		synchronize calendars and contacts
 
-MODPY_DISTV =	0.18.0
+MODPY_DISTV =		0.19.3
 DISTNAME =		vdirsyncer-${MODPY_DISTV}
-REVISION =		7
 
 CATEGORIES =		productivity
 
@@ -17,29 +16,31 @@ MODULES =		lang/python
 
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools_scm
-MODPY_PYTEST_ARGS =	tests/
 
 BUILD_DEPENDS =		textproc/py-sphinx>=4.0.2 \
-			textproc/py-sphinx_rtd_theme>=0.4.3 \
 			${RUN_DEPENDS}
 
 RUN_DEPENDS =		devel/py-atomicwrites \
+			www/py-aiohttp \
+			www/py-aiohttp-oauthlib \
+			devel/py-aiostream \
 			devel/py-click-log>=0.3.0 \
 			devel/py-click-threading \
-			www/py-requests-oauthlib \
-			www/py-requests-toolbelt
+			www/py-requests
 
 TEST_DEPENDS =		devel/py-hypothesis \
 			devel/py-test-cov \
-			devel/py-test-localserver \
-			www/py-urllib3
+			devel/py-test-httpserver \
+			devel/py-test-asyncio \
+			security/py-trustme \
+			devel/py-aioresponses
 
 TEST_ENV +=		DAV_SERVER=skip \
 			DETERMINISTIC_TESTS=true
 
 post-build:
 	cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
-		sphinx-build -b html -d _build/doctrees . _build/html
+		sphinx-build -b man -d _build/doctrees . _build/man
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
@@ -47,8 +48,8 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
 		CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE README.rst \
 		${PREFIX}/share/doc/vdirsyncer
-	cd ${WRKSRC}/docs/_build/html && \
-		pax -rw * ${PREFIX}/share/doc/vdirsyncer
+	cd ${WRKSRC}/docs/_build/man; \
+		${INSTALL_MAN} vdirsyncer.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/config.example \
 		${PREFIX}/share/examples/vdirsyncer
 
diff --git a/productivity/vdirsyncer/distinfo b/productivity/vdirsyncer/distinfo
index b166bfe4060..ccb5287da80 100644
--- a/productivity/vdirsyncer/distinfo
+++ b/productivity/vdirsyncer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.18.0.tar.gz) = J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE=
-SIZE (vdirsyncer-0.18.0.tar.gz) = 115125
+SHA256 (vdirsyncer-0.19.3.tar.gz) = 5DeFH+uYXew1RGVPj5z23RCbCwP34ZlWCGYDCS/+so8=
+SIZE (vdirsyncer-0.19.3.tar.gz) = 125478
diff --git a/productivity/vdirsyncer/pkg/PLIST b/productivity/vdirsyncer/pkg/PLIST
index 61e78fde9eb..bc003937adf 100644
--- a/productivity/vdirsyncer/pkg/PLIST
+++ b/productivity/vdirsyncer/pkg/PLIST
@@ -62,12 +62,12 @@ lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}base
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}dav.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}dav.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}etesync.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}etesync.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}google_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}google_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}memory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -76,9 +76,9 @@ lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}sing
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}singlefile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/base.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/dav.py
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/etesync.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/filesystem.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/google.py
+lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/google_helpers.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/http.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/memory.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/singlefile.py
@@ -96,6 +96,7 @@ lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync/status.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/utils.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/version.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/vobject.py
+@man man/man1/vdirsyncer.1
 share/doc/vdirsyncer/
 share/doc/vdirsyncer/AUTHORS.rst
 share/doc/vdirsyncer/CHANGELOG.rst
@@ -103,105 +104,5 @@ share/doc/vdirsyncer/CONTRIBUTING.rst
 share/doc/vdirsyncer/ISSUE_TEMPLATE.md
 share/doc/vdirsyncer/LICENSE
 share/doc/vdirsyncer/README.rst
-share/doc/vdirsyncer/_sources/
-share/doc/vdirsyncer/_sources/changelog.rst.txt
-share/doc/vdirsyncer/_sources/config.rst.txt
-share/doc/vdirsyncer/_sources/contact.rst.txt
-share/doc/vdirsyncer/_sources/contributing.rst.txt
-share/doc/vdirsyncer/_sources/donations.rst.txt
-share/doc/vdirsyncer/_sources/index.rst.txt
-share/doc/vdirsyncer/_sources/installation.rst.txt
-share/doc/vdirsyncer/_sources/keyring.rst.txt
-share/doc/vdirsyncer/_sources/license.rst.txt
-share/doc/vdirsyncer/_sources/packaging.rst.txt
-share/doc/vdirsyncer/_sources/partial-sync.rst.txt
-share/doc/vdirsyncer/_sources/problems.rst.txt
-share/doc/vdirsyncer/_sources/ssl-tutorial.rst.txt
-share/doc/vdirsyncer/_sources/tutorial.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/
-share/doc/vdirsyncer/_sources/tutorials/baikal.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/claws-mail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/davmail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/fastmail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/google.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/icloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/index.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/nextcloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/owncloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/radicale.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/systemd-timer.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/todoman.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/xandikos.rst.txt
-share/doc/vdirsyncer/_sources/vdir.rst.txt
-share/doc/vdirsyncer/_sources/when.rst.txt
-share/doc/vdirsyncer/_static/
-share/doc/vdirsyncer/_static/basic.css
-share/doc/vdirsyncer/_static/css/
-share/doc/vdirsyncer/_static/css/badge_only.css
-share/doc/vdirsyncer/_static/css/fonts/
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Bold.woff
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Bold.woff2
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Regular.woff
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Regular.woff2
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.eot
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.svg
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.ttf
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.woff
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-bold-italic.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-bold-italic.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-bold.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-bold.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-normal-italic.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-normal-italic.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-normal.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-normal.woff2
-share/doc/vdirsyncer/_static/css/theme.css
-share/doc/vdirsyncer/_static/doctools.js
-share/doc/vdirsyncer/_static/documentation_options.js
-share/doc/vdirsyncer/_static/file.png
-share/doc/vdirsyncer/_static/js/
-share/doc/vdirsyncer/_static/js/badge_only.js
-share/doc/vdirsyncer/_static/js/theme.js
-share/doc/vdirsyncer/_static/language_data.js
-share/doc/vdirsyncer/_static/minus.png
-share/doc/vdirsyncer/_static/plus.png
-share/doc/vdirsyncer/_static/pygments.css
-share/doc/vdirsyncer/_static/searchtools.js
-share/doc/vdirsyncer/_static/sphinx_highlight.js
-share/doc/vdirsyncer/changelog.html
-share/doc/vdirsyncer/config.html
-share/doc/vdirsyncer/contact.html
-share/doc/vdirsyncer/contributing.html
-share/doc/vdirsyncer/donations.html
-share/doc/vdirsyncer/genindex.html
-share/doc/vdirsyncer/index.html
-share/doc/vdirsyncer/installation.html
-share/doc/vdirsyncer/keyring.html
-share/doc/vdirsyncer/license.html
-share/doc/vdirsyncer/objects.inv
-share/doc/vdirsyncer/packaging.html
-share/doc/vdirsyncer/partial-sync.html
-share/doc/vdirsyncer/problems.html
-share/doc/vdirsyncer/search.html
-share/doc/vdirsyncer/searchindex.js
-share/doc/vdirsyncer/ssl-tutorial.html
-share/doc/vdirsyncer/tutorial.html
-share/doc/vdirsyncer/tutorials/
-share/doc/vdirsyncer/tutorials/baikal.html
-share/doc/vdirsyncer/tutorials/claws-mail.html
-share/doc/vdirsyncer/tutorials/davmail.html
-share/doc/vdirsyncer/tutorials/fastmail.html
-share/doc/vdirsyncer/tutorials/google.html
-share/doc/vdirsyncer/tutorials/icloud.html
-share/doc/vdirsyncer/tutorials/index.html
-share/doc/vdirsyncer/tutorials/nextcloud.html
-share/doc/vdirsyncer/tutorials/owncloud.html
-share/doc/vdirsyncer/tutorials/radicale.html
-share/doc/vdirsyncer/tutorials/systemd-timer.html
-share/doc/vdirsyncer/tutorials/todoman.html
-share/doc/vdirsyncer/tutorials/xandikos.html
-share/doc/vdirsyncer/vdir.html
-share/doc/vdirsyncer/when.html
 share/examples/vdirsyncer/
 share/examples/vdirsyncer/config.example