diff --git a/media/index.xml b/media/index.xml
index 1ddbee9..5b1cc47 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,6 +11,46 @@
     CD or DVD should you so choose.
     <ul class="media">
 
+<mediaitem title="Cory Doctorow - The War on General Purpose Computing">
+  <abstract>
+    <p>
+      No Matter Who's Winning the  War on General Purpose Computing, You're Losing
+    </p>
+    <p>
+      If cyberwar were a hockey game, it'd be the end of the first period and
+      the score would be tied 500-500. All offense, no defense.
+    </p>
+    <p>
+      Meanwhile, a horrible convergence has occurred as everyone from car
+      manufacturers to insulin pump makers have adopted the inkjet printer
+      business model, insisting that only their authorized partners can make
+      consumables, software and replacement parts -- with the side-effect of
+      making it a felony to report showstopper, potentially fatal bugs in
+      technology that we live and die by.
+    </p>
+    <p>
+      And then there's the FBI and the UK's David Cameron, who've joined in
+      with the NSA and GCHQ in insisting that everyone must be vulnerable to
+      Chinese spies and identity thieves and pervert voyeurs so that the spy
+      agencies will always be able to spy on everyone and everything, everywhere.
+    </p>
+    <p>
+      It's been fifteen years since the copyright wars kicked off, and we're
+      still treating the Internet as a glorified video-on-demand service --
+      when we're not treating it as a more perfect pornography distribution
+      system, or a jihadi recruitment tool.
+    </p>
+    <p>
+      It's all of those -- and more. Because it's the nervous system of the
+      21st century. We've got to stop treating it like a political football.
+    </p>
+  </abstract>
+  <presentor>Cory Doctorow</presentor>
+  <thumbnail file="cory-doctorow-f2015-thumb-small.png" />
+  <mediafile file="cory-doctorow-f2015.mp4" type="Talk (x264)" />
+  <mediafile file="cory-doctorow-f2015-hq.mp4" type="Talk (x246 Big File)" />
+</mediaitem>
+
 <mediaitem title="Algorithms for Shortest Paths">
   <abstract>
     <p>