diff --git a/doc/index.mdwn b/doc/index.mdwn
index 501a086747..a736be7841 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -62,16 +62,10 @@ files with git.
 <table>
 <tr>
 <td width="50%" valign="top">
-<video controls
-src="http://video.fosdem.org/2012/lightningtalks/git_annex___manage_files_with_git,_without_checking_their_contents_into_git.webm" width="100%"></video><br>
-A <a href="http://video.fosdem.org/2012/lightningtalks/git_annex___manage_files_with_git,_without_checking_their_contents_into_git.webm">15 minute introduction to git-annex</a>, presented by Richard Hartmann at Fosdem 2012.
+[[!inline raw=yes pages="video/Fosdem2012"]]
 </td>
 <td width="50%" valign="top">
-<video controls width="100%">
-<source type="video/mp4" src="http://mirror.linux.org.au/linux.conf.au/2013/mp4/gitannex.mp4">
-<source type="video/ogg" src="http://mirror.linux.org.au/linux.conf.au/2013/ogv/gitannex.ogv">
-</video><br>
-A <a href="http://mirror.linux.org.au/linux.conf.au/2013/mp4/gitannex.mp4">45 minute demo of git-annex and the assistant</a>), presented by Joey Hess at LCA 2013.
+[[!inline raw=yes pages="video/LCA2013"]]
 </td>
 </tr>
 </table>
diff --git a/doc/videos.mdwn b/doc/videos.mdwn
new file mode 100644
index 0000000000..d64ff66073
--- /dev/null
+++ b/doc/videos.mdwn
@@ -0,0 +1 @@
+[[!inline pages="./video/* and !./news/*/* and !*/Discussion" show="5"]]
diff --git a/doc/videos/Fosdem2012.mdwn b/doc/videos/Fosdem2012.mdwn
new file mode 100644
index 0000000000..27a8e9ec3a
--- /dev/null
+++ b/doc/videos/Fosdem2012.mdwn
@@ -0,0 +1,4 @@
+<video controls
+src="http://video.fosdem.org/2012/lightningtalks/git_annex___manage_files_with_git,_without_checking_their_contents_into_git.webm" width="100%"></video><br>
+A <a href="http://video.fosdem.org/2012/lightningtalks/git_annex___manage_files_with_git,_without_checking_their_contents_into_git.webm">15 minute introduction to git-annex</a>,
+presented by Richard Hartmann at Fosdem 2012.
diff --git a/doc/videos/LCA2013.mdwn b/doc/videos/LCA2013.mdwn
new file mode 100644
index 0000000000..b9bdb6c7c9
--- /dev/null
+++ b/doc/videos/LCA2013.mdwn
@@ -0,0 +1,5 @@
+<video controls width="100%">
+<source type="video/mp4" src="http://mirror.linux.org.au/linux.conf.au/2013/mp4/gitannex.mp4">
+<source type="video/ogg" src="http://mirror.linux.org.au/linux.conf.au/2013/ogv/gitannex.ogv">
+</video><br>
+A <a href="http://mirror.linux.org.au/linux.conf.au/2013/mp4/gitannex.mp4">45 minute talk and demo of git-annex and the assistant</a>), presented by Joey Hess at LCA 2013.