diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index 4eed35990..8123824e2 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -6,6 +6,8 @@
 	(do_load): Don't call do_unload
 	(socket_data_cb): Check for hang up first
 	(do_load): Don't call reset_filenames
+	(slave_data_cb): 
+	(config_log_write_entry): Call io_buffer_destroy
 
 	* archive.c, Makefile.am: Replace all instances of ximian-config
 	with ximian-setup-tools
diff --git a/archiver/config-log.c b/archiver/config-log.c
index 5bbca935d..204d0f9dc 100644
--- a/archiver/config-log.c
+++ b/archiver/config-log.c
@@ -533,6 +533,7 @@ config_log_write_entry (ConfigLog *config_log, gchar *backend_id,
 	if (config_log->p->socket_owner) {
 		slave_broadcast_data (NULL, config_log);
 		dump_log (config_log);
+		io_buffer_destroy (config_log->p->file_buffer);
 		do_load (config_log);
 	} else {
 		write_log (config_log->p->socket_buffer, entry);
@@ -1352,6 +1353,7 @@ slave_data_cb (GIOChannel *channel, GIOCondition condition,
 		{
 			slave_broadcast_data (slave, slave->config_log);
 			dump_log (slave->config_log);
+			io_buffer_destroy (slave->config_log->p->file_buffer);
 			do_load (slave->config_log);
 		}
 	}