diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index e333e6ab31f..5a3374fbef0 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -3,17 +3,17 @@
 , setuptoolsDarcs, numpy, nettools }:
 
 buildPythonPackage (rec {
-  name = "tahoe-lafs-1.6.0";
+  name = "tahoe-lafs-1.6.1";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.6.0.zip";
-    sha256 = "10j6s4wqqxb0x6plwvfnabxxl0k8jy1g1dfsrhpfgdi42f25dain";
+    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.6.1.zip";
+    sha256 = "1b0m1fj1lrd9kvlavd6303jjgvzasj6rnlwhdysn4i2zqriv8d9f";
   };
 
-  patches = [ ./fix-test-copy-using-filecap.patch ];
+  patches = [ ./test-timeout.patch ];
 
-  postPatch = ''
+  configurePhase = ''
     echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version"
     for i in *setup.py
     do
@@ -83,5 +83,6 @@ buildPythonPackage (rec {
     license = [ "GPLv2+" /* or */ "TGPPLv1+" ];
 
     maintainers = [ lib.maintainers.ludo ];
+    platforms = lib.platforms.gnu;  # arbitrary choice
   };
 })
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/fix-test-copy-using-filecap.patch b/pkgs/tools/networking/p2p/tahoe-lafs/fix-test-copy-using-filecap.patch
deleted file mode 100644
index 9318e0fa204..00000000000
--- a/pkgs/tools/networking/p2p/tahoe-lafs/fix-test-copy-using-filecap.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From http://allmydata.org/trac/tahoe/ticket/936 .
-
-Wed Feb  3 23:13:37 GMT Standard Time 2010  david-sarah@jacaranda.org
-  * Fix race condition in allmydata.test.test_cli.Cp.test_copy_using_filecap
-diff -rN -u old-tahoe/src/allmydata/test/test_cli.py new-tahoe/src/allmydata/test/test_cli.py
---- old-tahoe/src/allmydata/test/test_cli.py	2010-02-03 23:20:06.803000000 +0000
-+++ new-tahoe/src/allmydata/test/test_cli.py	2010-02-03 23:20:10.483000000 +0000
-@@ -1007,13 +1007,13 @@
-         self.set_up_grid()
-         outdir = os.path.join(self.basedir, "outdir")
-         os.mkdir(outdir)
--        self.do_cli("create-alias", "tahoe")
-         fn1 = os.path.join(self.basedir, "Metallica")
-         fn2 = os.path.join(outdir, "Not Metallica")
-         fn3 = os.path.join(outdir, "test2")
-         DATA1 = "puppies" * 10000
-         open(fn1, "wb").write(DATA1)
--        d = self.do_cli("put", fn1)
-+        d = self.do_cli("create-alias", "tahoe")
-+        d.addCallback(lambda res: self.do_cli("put", fn1))
-         def _put_file((rc, out, err)):
-             self.failUnlessEqual(rc, 0)
-             # keep track of the filecap
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/test-timeout.patch b/pkgs/tools/networking/p2p/tahoe-lafs/test-timeout.patch
new file mode 100644
index 00000000000..f9867e64bf8
--- /dev/null
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/test-timeout.patch
@@ -0,0 +1,12 @@
+See http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3194 .
+
+--- allmydata-tahoe-1.6.1/src/allmydata/test/test_immutable.py	2010-02-28 00:36:14.000000000 +0100
++++ allmydata-tahoe-1.6.1/src/allmydata/test/test_immutable.py	2010-03-02 11:40:38.000000000 +0100
+@@ -6,6 +6,7 @@ from twisted.trial import unittest
+ import random
+ 
+ class Test(common.ShareManglingMixin, unittest.TestCase):
++    timeout = 240
+     def test_test_code(self):
+         # The following process of stashing the shares, running
+         # replace_shares, and asserting that the new set of shares equals the