diff --git a/TODO b/TODO
index e011827c68864ca45d2974f129b0482c312c5857..f7cae0e52342a97eb26e2d037b0e189e496d0939 100644
--- a/TODO
+++ b/TODO
@@ -20,3 +20,6 @@ remove it.
 key release would be better. However, I couldn't find a way to do that so far.
 Even when holding down a key, everytime the eventloop runs I get a
 KeyRelease event.
+
+--thumb-title covers a very specific case, would be cool to make this more
+general (usable in index mode, as image info in thumbnail mode, etc.)
diff --git a/feh.1 b/feh.1
index 4dfd0b560d159682b1abbe5d90bb5f068c4045bd..b10e2bd3ca882922a1f72fb70f7dc305cbd74652 100644
--- a/feh.1
+++ b/feh.1
@@ -266,6 +266,9 @@ Same as Index mode, but the thumbnails are clickable image launchers.
 .B --cache-thumbnails
 Enable thumbnail caching (in ~/.thumbnails)
 .TP 5
+.B -~, --thumb-title STRING
+Set title for windows opened from thumbnail mode. See also FORMAT SPECIFIERS.
+.TP 5
 .B --bg-tile FILE
 .TP 5
 .B --bg-center FILE
diff --git a/src/options.c b/src/options.c
index 9fb50ffd6ed0964eb2acd021c760f1495dbfcd8e..2ce5984ad8a0c6f13293478123a9de8e025f2dd2 100644
--- a/src/options.c
+++ b/src/options.c
@@ -987,6 +987,8 @@ show_usage(void)
 " -t, --thumbnails          As --index, but clicking an image will open it in\n"
 "                           a new viewing window\n"
 "     --cache-thumbnails    Enable thumbnail caching\n"
+" -~, --thumb-title STRING  Set window title for images opened from thumbnail mode.\n"
+"                           Supports format specifiers, see there.\n"
 " -I, --fullindex           Same as index mode, but below each thumbnail you\n"
 "                           get image name, size and dimensions\n"
 "     --bg-tile FILE\n"