diff --git a/Summit2011.md b/Summit2011.md
index 310dcb5..e2b5c01 100644
--- a/Summit2011.md
+++ b/Summit2011.md
@@ -14,6 +14,24 @@ St.). We have conference room space for 6-8 people from tuesday through
 friday (bouncing around a bit because of pre-existing meetings) and
 snacks/drinks/wireless.
 
+* Address: 2 Harrison St, San Francisco, CA, 94105 (in a box delimited by Harrison, Spear, Folsom, and Embarcadero, closest to the Harrison side)
+* Where: SOMA, at the waterfront (Embarcadero) 
+* Map: [map](http://maps.google.com/maps?q=2+Harrison+Street,+San+Francisco,+CA&hl=en&ll=37.789031,-122.389326&spn=0.009191,0.020149&sll=37.789489,-122.388661&sspn=0.009191,0.020149&vpsrc=0&hnear=2+Harrison+St,+San+Francisco,+California+94105&t=m&z=16)
+* Parking: expensive. public transit is recommended. Use Embarcadero BART and walk south on Spear st.
+* Landmark: in the Hills Bros Coffee Company building (big lighted sign on the roof)
+* Beer: we are straight up from the Gordon Biersch Brewery, on the top floor.
+* Confusion: there are multiple parts to this building, with disjoint floors. We're in the part with Gensler, not the part with Google or the gym.
+* Entry:
+ * walk under the [tower](../raw/attachments/Summit2011/moz-tower.jpg) in the courtyard between the fountain and the fenced-in playground
+ * enter the lobby doors behind the [statue](../raw/attachments/Summit2011/moz-statue.jpg)
+ * take the elevators to the 7th floor. If the desk guard wants you to, sign in as a guest (Mozilla, to see Brian Warner). Hopefully you can just come straight up.
+ * tell Cristina at the front desk that you're here for the Tahoe Summit and she'll either call me or direct you to the right room
+* Rooms: we have to move around a bit. Think of it as a scenic tour of the office.
+ * Tuesday: 8-10 7B, 10-12 7Q, 12-5 7B
+ * Wednesday: 8-12 7P, 12-5 7N
+ * Thursday and Friday: 7N
+* Remoties: contact us on IRC (`#tahoe-lafs on freenode`) and we'll make something work
+
 
 ## Agenda Items