diff --git a/CHANGELOG b/CHANGELOG
index 1de258b9..a113b396 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,10 @@
 Fail2Ban (version 0.7.7)                           2007/02/08
 =============================================================
 
+ver. 0.?.? (2007/??/??) - ???
+----------
+- Fixed asctime pattern in datedetector.py
+
 ver. 0.7.7 (2007/02/08) - release candidate
 ----------
 - Added signal handling in fail2ban-client
diff --git a/TODO b/TODO
index aff717ac..87f64929 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,12 @@ Legend:
 # partially done
 * done
 
+- Discuss where Fail2ban should be installed (/usr/share,
+  /usr/lib/python/site-packages/, etc)
+
+- Cleanup fail2ban-client and fail2ban-server. Move code to
+  server/ and client/
+
 - Add timeout to external commands (signal alarm, watchdog
   thread, etc)
 
@@ -22,7 +28,7 @@ Legend:
   (openssh, postfix, proftp)
 
 - Added <USER> tag for failregex. Add features using this
-  information
+  information. Maybe add more tags
 
 - Look at the memory consumption. Decrease memory usage