diff --git a/photos/album.properties b/photos/album.properties
index 5d7d45d..ee71d95 100644
--- a/photos/album.properties
+++ b/photos/album.properties
@@ -1,3 +1,4 @@
 file.l1000729.jpg.caption=Test caption!
 file.IMG_0139.JPG.hidden=false
 dir.portraits.hidden=false
+sort=date desc
diff --git a/webapp/WEB-INF/velocity/photo.vm b/webapp/WEB-INF/velocity/photo.vm
index a1dcc4b..fdc0e30 100644
--- a/webapp/WEB-INF/velocity/photo.vm
+++ b/webapp/WEB-INF/velocity/photo.vm
@@ -17,6 +17,11 @@
     h1 {
       text-align: left;
     }
+    h2 {
+      margin-left: 30px;
+      text-align: left;
+      clear: both;
+    }
     a:link, a:visited {
       text-decoration: none;
       color: #4c4c4c;
@@ -62,9 +67,16 @@
   </div>
 #else
 
+#set($yr = "x")
 #foreach($en in $entry.getContents())
 #set($dim = $en.thumbnail.size.scaled($thmb))
 #set($thpath = $mapper.map(${en.thumbnail.getPath()}))
+#set($cdate = ${en.earliest})
+#set($cyr = $mapper.year($cdate))
+#if($cyr != $yr && !${entry.parent()})
+#set($yr = $cyr)
+  <h2>$yr</h2>
+#end
   <div class="grid">
     <span class="name">$en.name</span><br/>
     <a href="#navlink($en)"><img src="${base}${thpath}?size=${thmb}" border="0" width="${dim.width}" height="${dim.height}"/></a><br/>