-At [OHM2013](https://ohm2013.org/site/), there will be a lightning talk about tinc,
-and a workshop setting up VPNs using tinc at the Milliways village.
+At [OHM2013](https://ohm2013.org/site/), there will be a lightning talk about tinc in T2 on August 1, 15:55,
+and a workshop setting up VPNs using tinc at the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).