diff --git a/srcpkgs/khal/patches/sphinx-8.patch b/srcpkgs/khal/patches/sphinx-8.patch
deleted file mode 100644
index 928e49c4615..00000000000
--- a/srcpkgs/khal/patches/sphinx-8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 593495afe97cc32ccda2427cdfb54523b807d692 Mon Sep 17 00:00:00 2001
-From: Martin Stone <martin@d7415.co.uk>
-Date: Thu, 31 Oct 2024 14:43:22 +0000
-Subject: [PATCH] Replace intersphinx_mapping format removed in Sphinx 8.0.0
-
-Fixes #1356
----
- doc/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 2809221fb..6563ea98e 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -309,4 +309,4 @@ def write_section(specsection, secname, key, comment, output):
- 
- 
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/': None}
-+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 056161e739d..c697bd0d971 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,27 +1,37 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.11.3
-revision=2
-build_style=python3-module
-# Tests get the path to the configuration file wrong in an xbps-src chroot
+version=0.13.0
+revision=1
+build_style=python3-pep517
+# The first two tests get the path to the configuration file wrong in an
+# xbps-src chroot, the last one fails only sometimes for an unknown reason.
 make_check_args="
  --deselect tests/cli_test.py::test_configure_command
  --deselect tests/cli_test.py::test_configure_command_create_vdir
+ --deselect tests/khalendar_utils_test.py::TestSpecial::test_recurrence_id_with_timezone
 "
 _rundeps="python3-click python3-click-log python3-configobj python3-dateutil
- python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
- python3-atomicwrites"
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg"
 hostmakedepends="python3-setuptools_scm python3-Sphinx python3-sphinxcontrib $_rundeps"
 depends="$_rundeps"
 checkdepends="python3-pytest-xdist python3-freezegun python3-hypothesis
- vdirsyncer $depends"
+ vdirsyncer $depends python3-setuptools"
 short_desc="Command-line calendar build around CalDAV"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=a8ccbcc43fc1dbbc464e53f7f1d99cf15832be43a67f38700e535d99d9c1325e
+checksum=68fea8cd704e387e81b669c90322a8dafb4374f5876b07170c9c6e23415a3ee0
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# Some locale-related failures.
+	make_check_args+=" --deselect tests/cal_display_test.py::test_vertical_month_unicode
+	 --deselect tests/cal_display_test.py::test_vertical_month_unicode_weekdays
+	 --deselect tests/cal_display_test.py::test_vertical_month_unicode_weekdays_gr
+	 --deselect tests/cal_display_test.py::test_vertical_month_abbr_fr
+	"
+fi
 
 post_install() {
 	vlicense COPYING