diff --git a/TipsTricks.md b/TipsTricks.md
index 01d79c5..1e93c91 100644
--- a/TipsTricks.md
+++ b/TipsTricks.md
@@ -1,20 +1,24 @@
 ## Tahoe Tips & Tricks
 
+### git-annex can use Tahoe-LAFS as a backend
+
+[git-annex special remotes](http://git-annex.branchable.com/special_remotes/)
+
 ### Back caps/URIs up
 
-Tahoe users can encrypt their caps (new text file or ~/.tahoe/private/aliases) and upload it to [Google Docs](http://docs.google.com), which now accepts arbitrary file types.
+Tahoe-LAFS users can encrypt their caps (new text file or ~/.tahoe/private/aliases) and upload it to [Google Docs](http://docs.google.com), which now accepts arbitrary file types.
 
-### Publish iCal calendars over Tahoe
+### Publish iCal calendars over Tahoe-LAFS
 
 [Instructions](http://allmydata.org/pipermail/tahoe-dev/2009-July/002219.html)
 
-### Automatic Tahoe file repair
+### Automatic Tahoe-LAFS file repair
 
 [Instructions](http://allmydata.org/pipermail/tahoe-dev/2009-October/003012.html)
 
 ### Host [Bazaar](http://bazaar-vcs.org) repositories
 
-Support for Tahoe's FTP server has been merged into Bzr's mainline ([#294709](https://bugs.launchpad.net/tahoe-lafs/+bug/294709)). It may be preferable to use SFTP, though.
+Support for Tahoe-LAFS's FTP server has been merged into Bzr's mainline ([#294709](https://bugs.launchpad.net/tahoe-lafs/+bug/294709)). It may be preferable to use SFTP, though.
 
 ### Perforce backend storage