diff --git a/media/index.xml b/media/index.xml
index f0b681b..8fd4c81 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -32,7 +32,13 @@
     the only legitimate purpose of copyright -- to promote progress, for the
     benefit of the public -- then we must make changes in the other
     direction.
+    </p><p>
+    This talk by Richard M. Stallman is broken into two parts: the main talk
+    and the question and answer sessions following the talk. Both are
+    available in only OGG/Theora format in keeping with Stallman's wishes.
   </p></abstract>
+  <mediafile file="rms-talk.ogg" type="Talk (OGG/Theora)" size="687M" />
+  <mediafile file="rms-qa.ogg" type="Q/A (OGG/Theora)" size="225M" />
 </mediaitem>
 
 <mediaitem title="Usability in the Wild">
@@ -292,6 +298,7 @@
   <mediafile file="simon-talk-xvid.avi" type="XviD" size="178M" />
   <mediafile file="simon-talk.avi" type="DivX" size="178M" />
   <mediafile file="simon-talk.mpg" type="MPG" size="177M" />
+  <flvfile file="simon-talk.flv" />
 </mediaitem>
 
 <mediaitem title="Semacode - Image recognition on mobile camera phones">