diff --git a/photos/album.properties b/photos/album.properties
index 3329897..79a9f1a 100644
--- a/photos/album.properties
+++ b/photos/album.properties
@@ -3,3 +3,4 @@ file.IMG_0139.JPG.hidden=false
 file.fra_jakt.jpg.caption: Lorem ipsum "dolor sit amet", consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 dir.portraits.hidden=false
 sort=date desc
+file.salmon.avi.caption: Videos can have captions too.
diff --git a/src/main/webapp/WEB-INF/velocity/dynamic.vm b/src/main/webapp/WEB-INF/velocity/dynamic.vm
index 40f86bc..a1373ec 100644
--- a/src/main/webapp/WEB-INF/velocity/dynamic.vm
+++ b/src/main/webapp/WEB-INF/velocity/dynamic.vm
@@ -110,8 +110,12 @@ $D(function() {
 				    + "   <span class=\"name\">" + entry.name + "</span><br/>\n"
 				    + "   <div class=\"imgborder\"><a class=\"ss\" id=\"ent" + idx + "\" href=\"${base}" + entry.path + "?size=" + picSize + "\" title=\"" + entry.name + "\">"
 				    + "<img class=\"picture\" src=\"${base}" + (entry.type == "movie" ? entry.path + ".frame" : entry.path) + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n"
-				    + "<p id=\"" + entry.name + "\" class=\"caption\"></p>\n" 
 				    + "</div>\n");
+
+            var captionP = $("<p id=\"" + entry.name + "\" class=\"caption\"></p>\n");
+            captionP.text(entry.caption);
+            captionP.appendTo(gridDiv);
+
             gridDiv.appendTo('body');
 
 		    var element = gridDiv.filter("a.ss");