diff --git a/ChangeLog b/ChangeLog
index 1550de6f..d024804c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 1.9.5 (released xx.xx.xxxx)
   * catch httplib errors in robotparser
     Changed: linkcheck/robotparser2.py
+    Closes: SF bug 836864
 
 1.9.5 (released 31.10.2003)
   * Add Zope to servers with broken HEAD support, adjusted the FAQ
diff --git a/TODO b/TODO
index cf0a1f49..170ef421 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+- check if anchor checking is really disabled per default
+
+- test CGI script
+
 - all threads should regularly poll a status variable
   this can be used to make ctrl-c working faster, and to print messages