diff --git a/TODO b/TODO
index 198856a3dc487c3755ff4cda05cab1924f8d6f64..e9d6ef3d92004266e1b52a36303ace5d9c8ec9d9 100644
--- a/TODO
+++ b/TODO
@@ -22,3 +22,5 @@ KeyRelease event.
 general (usable in index mode, as image info in thumbnail mode, etc.)
 
 --reload-button might be useless (wtf is button 0)
+
+Control thumbnail mode (image selection, mainly) with keys.
diff --git a/feh.1 b/feh.1
index 70065bed6817f36a21985f2ceac2b1379dbc04ed..f8e0e60dfca306c47c8087408d24a1df44c0ca5d 100644
--- a/feh.1
+++ b/feh.1
@@ -666,8 +666,11 @@ view, automatically changing slides every 5 seconds.
 View all the images in /opt/images and below, sorted by width (smallest
 first) and move the image to ~/images/image_name when enter is pressed.
 .SH BUGS
-None known. However there are many, many options. It is possible that some
-do not work well in conjuncion with each other. Let me know :)
+When the files (or even the directory) feh is displaying is deleted by an
+external application while feh is running, trying to change or resize the
+current image may cause segmentation faults.
+.PP
+There are probably other bugs, too. If you find one, let me know :)
 .SH LICENSE
 Copyright Tom Gilbert (and various contributors), 1999, 2000
 .PP