diff --git a/aux/binpac b/aux/binpac
index 2a97dd5ff1..627e6bdfd3 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 2a97dd5ff19cc864cebd1b7687945857dadf96b3
+Subproject commit 627e6bdfd34b0b6ae124fe2e0bccd3a132b0aa93
diff --git a/aux/bro-aux b/aux/bro-aux
index b23a5d5614..afb29b38bc 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit b23a5d561440514b50efe9c9a005e390dea3d1d5
+Subproject commit afb29b38bcb08b67f2a86ea580a9b55d1a9ace05
diff --git a/aux/broccoli b/aux/broccoli
index 9fccc65e06..d35cff9239 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 9fccc65e065c490c0689393ddf1b4d6b8d1f1831
+Subproject commit d35cff92395a28b66d6863d1e3f956005ec87300
diff --git a/aux/broctl b/aux/broctl
index 3e0eb6e9e1..f3a2d34bf4 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 3e0eb6e9e147cb25307b3f057290e60747c5eaba
+Subproject commit f3a2d34bf4dcc37cd1ae5ed9197ee625b2d41422
diff --git a/configure b/configure
index 00fe074d90..d82c79b1ae 100755
--- a/configure
+++ b/configure
@@ -51,10 +51,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     CXXFLAGS               C++ compiler flags
 "
 
-sourcedir=`dirname $0`
-if [ "$sourcedir" = "." ]; then
-    sourcedir=`pwd`
-fi
+sourcedir="$( cd "$( dirname "$0" )" && pwd )"
 
 # Function to append a CMake cache entry definition to the
 # CMakeCacheEntries variable