diff --git a/nix/setup.cfg.patch b/nix/setup.cfg.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cc909bc4965975c99cf77c3ac30810804bc4be40
--- /dev/null
+++ b/nix/setup.cfg.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.cfg b/setup.cfg
+index 3856a101..371a19b3 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -38,7 +38,7 @@ install_requires =
+     python-challenge-bypass-ristretto
+     # Inherit our Twisted dependency from tahoe-lafs so we don't accidentally
+     # get the extras wrong here and break stuff.
+-    tahoe-lafs==1.14.0
++    tahoe-lafs
+     treq
+ 
+ [versioneer]
diff --git a/zkapauthorizer.nix b/zkapauthorizer.nix
index e76b19c5ebf03f74e6e04252ecfffa65f7cdaed0..89639e0d41ec84db5811503dd150f9c33250d0a3 100644
--- a/zkapauthorizer.nix
+++ b/zkapauthorizer.nix
@@ -27,6 +27,12 @@ buildPythonPackage rec {
     sphinx
   ];
 
+  patches = [
+    # Remove the Tahoe-LAFS version pin in distutils config.  We have our own
+    # pinning and also our Tahoe-LAFS package has a bogus version number. :/
+    ./nix/setup.cfg.patch
+  ];
+
   propagatedBuildInputs = [
     attrs
     zope_interface