diff --git a/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch b/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
deleted file mode 100644
index fc14cb5b7b2..00000000000
--- a/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Python 3.9 compatibility fix.
-diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
-index 07d164f..a7e2422 100644
---- a/vdirsyncer/storage/dav.py
-+++ b/vdirsyncer/storage/dav.py
-@@ -124,7 +124,7 @@ def _merge_xml(items):
-         return None
-     rv = items[0]
-     for item in items[1:]:
--        rv.extend(item.getiterator())
-+        rv.extend(item.iter())
-     return rv
- 
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template
index 906b77950d3..874b368d6a1 100644
--- a/srcpkgs/vdirsyncer/template
+++ b/srcpkgs/vdirsyncer/template
@@ -1,25 +1,26 @@
 # Template file for 'vdirsyncer'
 pkgname=vdirsyncer
-version=0.16.8
-revision=3
+version=0.18.0
+revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-atomicwrites python3-click python3-click-log
- python3-click-threading python3-setuptools python3-requests-toolbelt"
+ python3-click-threading python3-requests-toolbelt"
+checkdepends="python3-pytest python3-hypothesis $depends"
 short_desc="Synchronize calendars and addressbooks"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-3-Clause"
 homepage="https://vdirsyncer.pimutils.org/"
 distfiles="${PYPI_SITE}/v/vdirsyncer/vdirsyncer-${version}.tar.gz"
-checksum=bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5
+checksum=27bc3ed51f774935fbba392915c8c8d4cf639ae51a44b674686b49a1025fc201
 
-pre_build() {
-	sed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e '/use_scm_version/,+2d' \
-		-e "/author=/ a\
-		version='${version}',"
+do_check() {
+	# Disable coverage checks and those requiring unpackaged pytest-localserver
+	vsed -e 's/^addopts/noaddopts/' -i setup.cfg
+	PYTHONPATH="$(cd build/lib* && pwd)" \
+		python3 -m pytest -k 'not test_request_ssl_fingerprints'
 }
+
 post_install() {
 	vsconf config.example
 	vlicense LICENSE