diff --git a/Changelog b/Changelog
index a70cce365..48f54e91c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+2009-06-06 Makefile dependencies updated
+2009-06-05 Avoid a busy loop while sending very large replies against very fast links, this allows to be more responsive with other clients even under a KEY * against the loopback interface
+2009-06-05 Kill the background saving process before performing SHUTDOWN to avoid races
+2009-06-05 LREM now returns :0 for non existing keys
+2009-06-05 added config.h for #ifdef business isolation, added fstat64 for Mac OS X
+2009-06-04 macosx specific zmalloc.c, uses malloc_size function in order to avoid to waste memory and time to put an additional header
+2009-06-04 DEBUG OBJECT implemented
 2009-06-04 backtrace support removed: unreliable stack trace :(
 2009-06-04 initial backtrace dumping on sigsegv/sigbus + debug command
 2009-06-03 Python lib updated
diff --git a/TODO b/TODO
index 0540346f7..a08768074 100644
--- a/TODO
+++ b/TODO
@@ -2,10 +2,7 @@ BEFORE REDIS 1.0.0-rc1
 
  * Add number of keys for every DB in INFO
  * Resize the expires and Sets hash tables if needed as well? For Sets the right moment to check for this is probably in SREM
- * What happens if the saving child gets killed or segfaults instead of ending normally? Handle this.
  * check 'server.dirty' everywere. Make it proprotional to the number of objects modified.
- * Shutdown must kill other background savings before to start saving. Otherwise the DB can get replaced by the child that rename(2) after the parent for some reason. Child should trap the signal and remove the temp file name.
- * Make sure to convert all the fstat() calls to 64bit versions.
  * Cover most of the source code with test-redis.tcl
 
 AFTER 1.0 stable release