diff --git a/CHANGES b/CHANGES
index c59e881e1a..8448759f0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.3-7 | 2014-06-26 17:35:18 -0700
+
+  * Extending "make test-all" to include aux/bro-aux. (Robin Sommer)
+    
 2.3-6 | 2014-06-26 17:24:10 -0700
 
   * DataSeries compilation issue fixed. (mlaterman)
diff --git a/Makefile b/Makefile
index f4b2104c73..2b8e66503b 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ test:
 test-all: test
 	test -d aux/broctl && ( cd aux/broctl && make test )
 	test -d aux/btest  && ( cd aux/btest && make test )
+	test -d aux/bro-aux && ( cd aux/bro-aux && make test )
 
 configured:
 	@test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 )
diff --git a/VERSION b/VERSION
index ec69c578de..2a8c331dd7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-6
+2.3-7
diff --git a/aux/bro-aux b/aux/bro-aux
index 5721df4f5f..1e0afc6ad2 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 5721df4f5f6fa84de6257cca6582a28e45831786
+Subproject commit 1e0afc6ad205199a495dfd2eb28d8aad80d41753