diff --git a/doc/BUGS b/doc/BUGS
index b08de673c..f77fa3fcd 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -1,6 +1,10 @@
 Bugs
 ====
 
+- Prevent invalid filenames (e.g. com1) when downloading on Windows
+
+- Auto-insert-mode sometimes doesn't work correctly
+
 - Sidewise scrolling via mousewheel broken
 
 - Space-scrolling sometimes broken until clicking into page
diff --git a/doc/TODO b/doc/TODO
index 89b7d1e70..6bd93c843 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -42,6 +42,8 @@ New big features
 Improvements / minor features
 =============================
 
+- Downloading: re-ask instead of killing download if path is invalid
+- Downloading: open files
 - Distinction between :q and :wq, add ZZ and ZQ shortcuts.
 - set_toggle to toggle setting between two states
 - Customizable statusbar