diff --git a/AboutUs.md b/AboutUs.md
index 6338fc1..1b3cac5 100644
--- a/AboutUs.md
+++ b/AboutUs.md
@@ -1,45 +1,49 @@
+Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers. We are grateful for their energy, expertise, and support. Some of main contributors to this project are listed below. If you feel that somebody is missing from the list, please let us know and we'll update the list.
-
Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers. We are grateful for their energy, expertise, and support. Some of main contributors to this project are listed below. If you feel that somebody is missing from the list, please let us know and we'll update the list.
+## Active Volunteers
-
-
-
-
-Active Volunteers
-People who broke Tahoe-LAFS
-
-GSoC 2013 Students and Their Mentors
-
-
- Mark Berger | Zooko Wilcox-O'Hearn, Daira Hopwood, and Brian Warner |
-
+## People who broke Tahoe-LAFS
-GSoC 2010 Students and Their Mentors
-
+[/hacktahoelafs/ The *Hack Tahoe-LAFS* Hall Of Fame]
+
+## GSoC 2013 Students and Their Mentors
+
+Mark Berger*
+
+* Zooko Wilcox-O'Hearn, Daira Hopwood, and Brian Warner
+
+## GSoC 2010 Students and Their Mentors
+
+Kevan Carstensen*
+
+* Brian Warner
+Josip Lisec*
+
+* Daira Hopwood
+Yu Xue*
+
+* Jack Lloyd
+Faruque Sarker*
+
+> Zooko
+
+[/wiki/GSoCIdeas2010 Tahoe-LAFS GSoC Page at Google]
-Contributors of Source Code and Docs
-See the CREDITS file for a list of everyone who has contributed code and docs which we included in the Tahoe-LAFS source tree.
+## Contributors of Source Code and Docs
+See [/browser/trunk/CREDITS the CREDITS file] for a list of everyone who has contributed code and docs which we included in the Tahoe-LAFS source tree.
+
+## Emeritus Volunteers
-Emeritus Volunteers
| David Triendl |
| Patrick "Marlowe" [McDonald](McDonald) |