diff --git a/CHANGES b/CHANGES
index cbd40d3f46..c3bd088bb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 
-2.0-beta-pre | 2011-10-26 14:48:59 -0700
+1.6-dev-1507 | 2011-10-26 15:10:18 -0700
 
-  * Release 2.0-beta-pre.
+  * Baseline updates. (Robin Sommer)
 
 1.6-dev-1506 | 2011-10-26 14:48:43 -0700
 
diff --git a/VERSION b/VERSION
index 0cfd5a6adb..1240d2f8ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0-beta-pre
+1.6-dev-1507
diff --git a/doc/scripts/DocSourcesList.cmake b/doc/scripts/DocSourcesList.cmake
index a74d04f42f..9d99effc02 100644
--- a/doc/scripts/DocSourcesList.cmake
+++ b/doc/scripts/DocSourcesList.cmake
@@ -42,6 +42,7 @@ rest_target(${psd} base/frameworks/notice/actions/add-geodata.bro)
 rest_target(${psd} base/frameworks/notice/actions/drop.bro)
 rest_target(${psd} base/frameworks/notice/actions/email_admin.bro)
 rest_target(${psd} base/frameworks/notice/actions/page.bro)
+rest_target(${psd} base/frameworks/notice/actions/pp-alarms.bro)
 rest_target(${psd} base/frameworks/notice/cluster.bro)
 rest_target(${psd} base/frameworks/notice/extend-email/hostnames.bro)
 rest_target(${psd} base/frameworks/notice/main.bro)
diff --git a/doc/scripts/genDocSourcesList.sh b/doc/scripts/genDocSourcesList.sh
index b550ba4ad5..a10121221a 100755
--- a/doc/scripts/genDocSourcesList.sh
+++ b/doc/scripts/genDocSourcesList.sh
@@ -11,6 +11,8 @@
 # Specific scripts can be blacklisted below when e.g. they currently aren't
 # parseable or they just aren't meant to be documented.
 
+export LC_ALL=C # Make sorting stable.
+
 blacklist ()
     {
     if [[ "$blacklist" == "" ]]; then
diff --git a/scripts/base/frameworks/notice/actions/pp-alarms.bro b/scripts/base/frameworks/notice/actions/pp-alarms.bro
index f3a4fac9fd..48961e8404 100644
--- a/scripts/base/frameworks/notice/actions/pp-alarms.bro
+++ b/scripts/base/frameworks/notice/actions/pp-alarms.bro
@@ -2,6 +2,10 @@
 #! in regular intervals, formatted for better human readability. If activated,
 #! that replaces the default summary mail having the raw log output.
 
+@load base/utils/site
+@load base/frameworks/cluster
+@load ../main
+
 module Notice;
 
 export {
@@ -104,8 +108,10 @@ function do_msg(out: file, n: Info, line1: string, line2: string, line3: string,
 	if ( host != 0.0.0.0 )
 		{
 		local country = "";
+@ifdef ( Notice::ACTION_ADD_GEODATA ) # Make tests happy, cyclic dependency.
 		if ( n?$remote_location && n$remote_location?$country_code  )
 			country = fmt(" (%s)", n$remote_location$country_code);
+@endif		
 
 		name = fmt(" %s = %s%s", host, name, country);
 		}
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 2a49328acb..7a461a3903 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
@@ -38,6 +38,7 @@ scripts/base/init-default.bro
       scripts/base/frameworks/cluster/./main.bro
         scripts/base/frameworks/control/__load__.bro
           scripts/base/frameworks/control/./main.bro
+    scripts/base/frameworks/notice/./actions/pp-alarms.bro
   scripts/base/frameworks/dpd/__load__.bro
     scripts/base/frameworks/dpd/./main.bro
   scripts/base/frameworks/signatures/__load__.bro