diff --git a/photos/album.properties b/photos/album.properties
index 79a9f1a..eebf075 100644
--- a/photos/album.properties
+++ b/photos/album.properties
@@ -4,3 +4,4 @@ file.fra_jakt.jpg.caption: Lorem ipsum "dolor sit amet", consectetur adipisicing
 dir.portraits.hidden=false
 sort=date desc
 file.salmon.avi.caption: Videos can have captions too.
+dir.problemcases.caption: Directories can have captions too.
diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
index db645ff..171366e 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
@@ -177,7 +177,7 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
                         thumbnail.setDuration(duration);
                     }
                 }
-            } else if (key.startsWith("dir.") && !key.endsWith(".hidden")) {
+            } else if (key.startsWith("dir.") && !key.endsWith(".hidden") && !key.endsWith(".caption")) {
                 String name = key.substring("dir.".length());
                 boolean hidden = Boolean.parseBoolean(props.getProperty("dir." + name + ".hidden"));
                 if (!hidden) {
@@ -189,7 +189,8 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
                     Date fileDate = dir.getEarliest();
                     if (fileDate != null && fileDate.before(oldest)) {
                         oldest = fileDate;
-                    }                    
+                    }
+                    dir.setCaption(props.getProperty("dir." + name + ".caption"));
                 }
             }
         }