diff --git a/CHANGES b/CHANGES
index 144a442d3d..4914c1ca4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-961 | 2018-09-04 12:07:54 -0500
+
+  * Sort output of a coverage unit test (Jon Siwek, Corelight)
+
+  * Remove non-ascii char from rdp/consts.bro (Jon Siwek, Corelight)
+
 2.5-957 | 2018-09-04 09:28:47 -0500
 
   * Fix/improve the find-bro-logs.test (Daniel Thayer)
diff --git a/VERSION b/VERSION
index 57e18e3493..14e4e8b138 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-957
+2.5-961
diff --git a/testing/btest/coverage/bare-mode-errors.test b/testing/btest/coverage/bare-mode-errors.test
index 24f3aced9d..2310b66b4b 100644
--- a/testing/btest/coverage/bare-mode-errors.test
+++ b/testing/btest/coverage/bare-mode-errors.test
@@ -6,4 +6,4 @@
 #
 # @TEST-EXEC: test -d $DIST/scripts
 # @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.bro`; do bro -b --parse-only $script >>errors 2>&1; done
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff errors
+# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-sort" btest-diff errors