diff --git a/CHANGES b/CHANGES
index eca1a7e756..69cf7f275c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,20 @@
 
+2.1-640 | 2013-05-15 17:24:09 -0700
+
+  * Support for cleaning up threads that have terminated. (Bernhard
+    Amann and Robin Sommer). Includes:
+
+        - Both logging and input frameworks now clean up threads once
+          they aren't further needed anymnore.
+
+        - New function Log::remove_stream() that removes a logging
+          stream, stopping all writer threads that are associated with
+          it. Note, however, that removing a *filter* from a stream
+          still doesn't clean up any threads. The problem is that
+          because of the output paths potentially being created
+          dynamically it's unclear if the writer thread will still be
+          needed in the future.
+
 2.1-626 | 2013-05-15 16:09:31 -0700
 
   * Add "reservoir" sampler for SumStats framework. This maintains
diff --git a/VERSION b/VERSION
index aa4d3b9264..3a38860835 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-626
+2.1-640
diff --git a/doc/scripts/DocSourcesList.cmake b/doc/scripts/DocSourcesList.cmake
index bbc873be78..e4c92a0777 100644
--- a/doc/scripts/DocSourcesList.cmake
+++ b/doc/scripts/DocSourcesList.cmake
@@ -70,6 +70,7 @@ rest_target(${psd} base/frameworks/sumstats/cluster.bro)
 rest_target(${psd} base/frameworks/sumstats/main.bro)
 rest_target(${psd} base/frameworks/sumstats/non-cluster.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/average.bro)
+rest_target(${psd} base/frameworks/sumstats/plugins/last.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/max.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/min.bro)
 rest_target(${psd} base/frameworks/sumstats/plugins/sample.bro)
diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
index 1e21f17705..3cfd9b58a7 100644
--- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
@@ -3,7 +3,7 @@
 #empty_field	(empty)
 #unset_field	-
 #path	loaded_scripts
-#open	2013-05-15-23-01-31
+#open	2013-05-16-00-19-22
 #fields	name
 #types	string
 scripts/base/init-bare.bro
@@ -83,6 +83,7 @@ scripts/base/init-default.bro
     scripts/base/frameworks/sumstats/main.bro
     scripts/base/frameworks/sumstats/plugins/__load__.bro
       scripts/base/frameworks/sumstats/plugins/average.bro
+      scripts/base/frameworks/sumstats/plugins/last.bro
       scripts/base/frameworks/sumstats/plugins/max.bro
       scripts/base/frameworks/sumstats/plugins/min.bro
       scripts/base/frameworks/sumstats/plugins/sample.bro
@@ -140,4 +141,4 @@ scripts/base/init-default.bro
     scripts/base/protocols/syslog/main.bro
   scripts/base/misc/find-checksum-offloading.bro
 scripts/policy/misc/loaded-scripts.bro
-#close	2013-05-15-23-01-31
+#close	2013-05-16-00-19-22