diff --git a/VolunteerGrid.md b/VolunteerGrid.md
index a7e1e8c..3404671 100644
--- a/VolunteerGrid.md
+++ b/VolunteerGrid.md
@@ -1,19 +1,19 @@
 # About
 
-The volunteergrid is a tahoe storage grid from users for users. Contrary to the [TestGrid](TestGrid)–which may be flushed at any time for development/testing reasons–the volunteergrid is meant as a stable alternative to the commercial [allmydata.com grid](http://allmydata.com/). It was [proposed by Eugene L.](http://allmydata.org/pipermail/tahoe-dev/2009-February/001248.html) in February 2009 and an introducer [was set up](http://allmydata.org/pipermail/tahoe-dev/2009-February/001341.html) by Zooko after the idea received a fair amount of praise. This introducer unfortunately died when nooxie's upgrade went wrong. A [new, more resilient, introducer](http://allmydata.org/pipermail/tahoe-dev/2009-December/003290.html) was implemented by [François Deppierraz]mailto:francois(at)ctrlaltdel.ch in December 2009.
+The volunteergrid is a tahoe storage grid from users for users. Contrary to the [TestGrid](TestGrid)–which may be flushed at any time for development/testing reasons–the volunteergrid is meant as a stable alternative to the commercial [allmydata.com grid](http://allmydata.com/). It was [proposed by Eugene L.](http://tahoe-lafs.org/pipermail/tahoe-dev/2009-February/001248.html) in February 2009 and an introducer [was set up](http://tahoe-lafs.org/pipermail/tahoe-dev/2009-February/001341.html) by Zooko after the idea received a fair amount of praise. This introducer unfortunately died when nooxie's upgrade went wrong. A [new, more resilient, introducer](http://tahoe-lafs.org/pipermail/tahoe-dev/2009-December/003290.html) was implemented by [François Deppierraz]mailto:francois(at)ctrlaltdel.ch in December 2009.
 
 There are usually between 10 and 15 active server nodes, but new nodes are always welcome.
 
 
 # Setting up a volunteergrid (storage) node
- * Follow the [install instructions](http://allmydata.org/source/tahoe/trunk/docs/install.html)
- * If your storage server is behind a firewall/NAT, please set up port forwarding to your *tub.port* and point *tub.location* to your external IP address (see [configuration](http://allmydata.org/source/tahoe/trunk/docs/configuration.txt)).
+ * Follow the [install instructions](http://tahoe-lafs.org/source/tahoe/trunk/docs/quickstart.html)
+ * If your storage server is behind a firewall/NAT, please set up port forwarding to your *tub.port* and point *tub.location* to your external IP address (see [configuration](http://tahoe-lafs.org/source/tahoe/trunk/docs/configuration.txt)).
  * Set your introducer.furl to
 
-<div style="font-size: 40%;">pb://yni7uuz6oc3lxvjdcivm7mzz6v64yibx@volunteergrid.allmydata.org:52627,tahoe.ctrlaltdel.ch:52627,volunteergrid.lothar.com:52627,introducer.volunteergrid.org:52627/introducer</div>
+<div style="font-size: 40%;">pb://yni7uuz6oc3lxvjdcivm7mzz6v64yibx@volunteergrid.tahoe-lafs.org:52627,tahoe.ctrlaltdel.ch:52627,volunteergrid.lothar.com:52627,introducer.volunteergrid.org:52627/introducer</div>
 
  * Set your WUI port (`web.port`) to 9797 (so that conventional http``````://localhost:9797/<some-filecap> URLs work).
- * Please subscribe to the [volunteergrid-l](http://allmydata.org/cgi-bin/mailman/listinfo/volunteergrid-l) mailing list - it is very low-traffic but might feature important announcements.
+ * Please subscribe to the [volunteergrid-l](http://tahoe-lafs.org/cgi-bin/mailman/listinfo/volunteergrid-l) mailing list - it is very low-traffic but might feature important announcements.
  * Add your node to the [map](http://webcontent.osm.lab.rfc822.org/tahoe/).
 
 # Best practices