diff --git a/CHANGES b/CHANGES
index 3ee08d9..1de7c2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
-3.1d:
+3.1:
   Add -. flag to disable vhosting
   Support server push CGI
   Handle busybox tcpsvd
   Changed formatting of directory indexing
   Handle read timeout
   Fix if-modified-since bug with keepalive connections
+  Change to CGI's directory on exec
 
 3.0:
   More or less a ground-up rewrite.  A few fnord parts remain
diff --git a/TODO b/TODO
index a81f3df..94ddcce 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1 @@
-* Chdir to the directory containing the CGI
-* There is some sort of keepalive problem with static HTML
 * Investigate CGI keep-alive