diff --git a/CHANGES b/CHANGES
index dd0b98bf72..000c7ae6e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.0-beta-98 | 2011-12-07 08:12:08 -0800
+
+  * Adapting test-suite's diff-all so that it expands globs in both
+    current and baseline directory. Closes #677. (Robin Sommer)
+
 2.0-beta-97 | 2011-12-06 11:49:29 -0800
 
   * Omit loading local-<node>.bro scripts from base cluster framework.
diff --git a/VERSION b/VERSION
index d8c774d329..6f30af8ad8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0-beta-97
+2.0-beta-98
diff --git a/testing/external/scripts/diff-all b/testing/external/scripts/diff-all
index 597c769687..329bbb7f00 100755
--- a/testing/external/scripts/diff-all
+++ b/testing/external/scripts/diff-all
@@ -1,6 +1,10 @@
 #! /usr/bin/env bash
 #
-# Runs btest-diff on $@ and fails if any fails.
+# Runs btest-diff on $@ and fails if any fails. If $@ contains globs, we expand
+# them relative to *both* the current directory and the test's baseline
+# directory so that we spot missing files. Note that you will need to quote
+# the globals in the TEST-EXEC line as otherwise they will have been expanded relative
+# to the current directory already when this scripts runs.
 
 diag=$TEST_DIAGNOSTICS
 
@@ -14,7 +18,10 @@ fi
 
 rc=0;
 
-for i in $@; do
+files_cwd=`ls $@`
+files_baseline=`cd $TEST_BASELINE && ls $@`
+
+for i in `echo $files_cwd $files_baseline | sort | uniq`; do
     if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" ]]; then
         if ! btest-diff $i; then
            echo "" >>$diag
diff --git a/testing/external/scripts/skel/test.skeleton b/testing/external/scripts/skel/test.skeleton
index becd970d78..a76f3d4d09 100644
--- a/testing/external/scripts/skel/test.skeleton
+++ b/testing/external/scripts/skel/test.skeleton
@@ -1,5 +1,5 @@
 # @TEST-EXEC: zcat $TRACES/trace.gz | bro -r - %INPUT
-# @TEST-EXEC: $SCRIPTS/diff-all *.log
+# @TEST-EXEC: $SCRIPTS/diff-all '*.log'
 
 @load testing-setup
 @load test-all-policy