diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index c22db465b223..c393f48ef9e9 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch2
 , python3Packages
 , nixosTests
 }:
@@ -18,6 +19,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-compatibility-with-icalendar-v6.patch";
+      url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch";
+      excludes = [ "requirements.txt" ];
+      hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU=";
+    })
+  ];
+
   nativeBuildInputs = with python3Packages; [
     setuptools
     wheel
@@ -31,6 +41,7 @@ python3Packages.buildPythonApplication rec {
     icalendar
     jinja2
     multidict
+    pytz
     vobject
   ];