diff --git a/CHANGES b/CHANGES
index 0eade57028..8871efd0dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.5-951 | 2018-08-31 15:33:31 -0500
+
+  * Improve `make dist` (Jon Siwek, Corelight)
+
 2.5-950 | 2018-08-31 08:54:36 -0700
 
   * Add @deprecated directive and deprecate policy/protocols/smb/__load__.bro
diff --git a/Makefile b/Makefile
index 74e8c3aa3e..5642762e11 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,10 @@
 #
 
 BUILD=build
-REPO=`basename \`git config --get remote.origin.url | sed 's/^[^:]*://g'\``
-VERSION_FULL=$(REPO)-`cat VERSION`
-VERSION_MIN=$(REPO)-`cat VERSION`-minimal
-HAVE_MODULES=git submodule | grep -v cmake >/dev/null
+REPO=$$(cd $(CURDIR) && basename $$(git config --get remote.origin.url | sed 's/^[^:]*://g'))
+VERSION_FULL=$(REPO)-$$(cd $(CURDIR) && cat VERSION)
+VERSION_MIN=$(REPO)-$$(cd $(CURDIR) && cat VERSION)-minimal
+GITDIR=$$(test -f .git && echo $$(cut -d" " -f2 .git) || echo .git)
 
 all: configured
 	$(MAKE) -C $(BUILD) $@
@@ -30,17 +30,19 @@ docclean: configured
 	$(MAKE) -C $(BUILD) $@
 
 dist:
-	@rm -rf $(VERSION_FULL) $(VERSION_FULL).tgz
-	@rm -rf $(VERSION_MIN) $(VERSION_MIN).tgz
-	@git clone --recursive . $(VERSION_FULL) >/dev/null 2>&1
-	@find $(VERSION_FULL) -name .git\* | xargs rm -rf
-	@tar -czf $(VERSION_FULL).tgz $(VERSION_FULL) && echo Package: $(VERSION_FULL).tgz && rm -rf $(VERSION_FULL)
-	@$(HAVE_MODULES) && git clone . $(VERSION_MIN) >/dev/null 2>&1 || exit 0
-	@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init cmake >/dev/null 2>&1) || exit 0
-	@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init src/3rdparty >/dev/null 2>&1) || exit 0
-	@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init magic >/dev/null 2>&1) || exit 0
-	@$(HAVE_MODULES) && find $(VERSION_MIN) -name .git\* | xargs rm -rf || exit 0
-	@$(HAVE_MODULES) && tar -czf $(VERSION_MIN).tgz $(VERSION_MIN) && echo Package: $(VERSION_MIN).tgz && rm -rf $(VERSION_MIN) || exit 0
+	@test -e ../$(VERSION_FULL) && rm -ri ../$(VERSION_FULL) || true
+	@cp -R . ../$(VERSION_FULL)
+	@for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do ((cd ../$(VERSION_FULL)/$$i && test -f .git && cp -R $(GITDIR) .gitnew && rm -f .git && mv .gitnew .git && sed -i.bak -e 's#[[:space:]]*worktree[[:space:]]*=[[:space:]]*.*##g' .git/config) || true); done
+	@for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do (cd ../$(VERSION_FULL)/$$i && git reset -q --hard && git clean -ffdxq); done
+	@(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf)
+	@mv ../$(VERSION_FULL) .
+	@tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL)
+	@echo Package: $(VERSION_FULL).tar.gz
+	@mv $(VERSION_FULL) $(VERSION_MIN)
+	@(cd $(VERSION_MIN) && for i in aux/*; do rm -rf $$i/*; done)
+	@tar -czf $(VERSION_MIN).tar.gz $(VERSION_MIN)
+	@echo Package: $(VERSION_MIN).tar.gz
+	@rm -rf $(VERSION_MIN)
 
 distclean:
 	rm -rf $(BUILD)
diff --git a/VERSION b/VERSION
index 5097186c1d..5e419541ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-950
+2.5-951
diff --git a/aux/bifcl b/aux/bifcl
index b0ba021208..2c106da5c5 160000
--- a/aux/bifcl
+++ b/aux/bifcl
@@ -1 +1 @@
-Subproject commit b0ba021208c0c5fe8d7c92412b919d6667f63961
+Subproject commit 2c106da5c56f0c864f9894dff21bd6557ef219eb
diff --git a/aux/binpac b/aux/binpac
index 3ebf910b6b..090d2614a6 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 3ebf910b6befde6352e3af0b25589cfc2545cb5a
+Subproject commit 090d2614a6dfd2a354cb36f890f9d52557300c74
diff --git a/aux/bro-aux b/aux/bro-aux
index 9866d31e45..2c37ea379b 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 9866d31e45f5e1467c0f1fd4a1cd9948b067ce43
+Subproject commit 2c37ea379bc25dd4b4fd38ee2bb40068e5418a2b
diff --git a/aux/broccoli b/aux/broccoli
index 1898e81bba..9e6290ee3f 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 1898e81bba7c595108bc20c5148df7f0f6a2258f
+Subproject commit 9e6290ee3f398141d90995bb766163218e9076a8
diff --git a/aux/broctl b/aux/broctl
index a88cb3434e..9455886e95 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit a88cb3434e05dbb117687f6152acc8892ed969ca
+Subproject commit 9455886e959b5d9ddeccc86ae5428706e2424237
diff --git a/aux/broker b/aux/broker
index a3e188680c..6f8cfce62c 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit a3e188680cd2889edbb9cf09c01fb1f031a90975
+Subproject commit 6f8cfce62cbfd80743cae02e89b72bd97e8e9114