diff --git a/CHANGES b/CHANGES
index 69cf7f275c..36c1ee63cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,19 +1,23 @@
 
+2.1-641 | 2013-05-15 18:15:09 -0700
+
+  * Test update. (Robin Sommer)
+
 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.
+      - 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.
+      - 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
 
diff --git a/VERSION b/VERSION
index 3a38860835..66bc7b0865 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-640
+2.1-641
diff --git a/scripts/test-all-policy.bro b/scripts/test-all-policy.bro
index 35d9f89de9..7b349b64a3 100644
--- a/scripts/test-all-policy.bro
+++ b/scripts/test-all-policy.bro
@@ -78,3 +78,5 @@
 @load tuning/defaults/warnings.bro
 @load tuning/logs-to-elasticsearch.bro
 @load tuning/track-all-assets.bro
+
+redef LogElasticSearch::server_host = "";