diff --git a/Makefile b/Makefile
index 0993daf391..c711c8acf6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,11 @@ dist:
 	@rm -rf $(VERSION_MIN) $(VERSION_MIN).tgz
 	@mkdir $(VERSION_FULL)
 	@tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git -cf - . | ( cd $(VERSION_FULL) && tar -xpf - )
+	@( cd $(VERSION_FULL) && cp -R ../.git . && git reset -q --hard HEAD && git clean -xdfq && rm -rf .git )
 	@tar -czf $(VERSION_FULL).tgz $(VERSION_FULL) && echo Package: $(VERSION_FULL).tgz && rm -rf $(VERSION_FULL)
 	@$(HAVE_MODULES) && mkdir $(VERSION_MIN) || exit 0
 	@$(HAVE_MODULES) && tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git `git submodule | awk '{print "--exclude="$$2}' | grep -v cmake | tr '\n' ' '` -cf - . | ( cd $(VERSION_MIN) && tar -xpf - ) || exit 0
+	@$(HAVE_MODULES) && ( cd $(VERSION_MIN) && cp -R ../.git . && git reset -q --hard HEAD && git clean -xdfq && rm -rf .git ) || exit 0
 	@$(HAVE_MODULES) && tar -czf $(VERSION_MIN).tgz $(VERSION_MIN) && echo Package: $(VERSION_MIN).tgz && rm -rf $(VERSION_MIN) || exit 0
 
 bindist:
diff --git a/aux/binpac b/aux/binpac
index 41a046e47a..c8760bd068 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 41a046e47af2bdb6c54f306ae600bbe69798a190
+Subproject commit c8760bd06861e2cfe9a4bc652fb634a6f6422ea6
diff --git a/aux/bro-aux b/aux/bro-aux
index 9730115948..c0b0d58bc6 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 9730115948982d06faaf3845d73961dbd81ed236
+Subproject commit c0b0d58bc60c006445aa767fcc0ce09b3d317a36
diff --git a/aux/broccoli b/aux/broccoli
index 27826f49a8..32233c4459 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 27826f49a835fa3653661231d46dcb83b92d8324
+Subproject commit 32233c4459d5196712b7f8de7b85875cc91d4c3a
diff --git a/aux/broctl b/aux/broctl
index 7c9062e92f..44797ae8a2 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 7c9062e92f7b69af47831d46c331e6b8a3b09296
+Subproject commit 44797ae8a21adcb478dcea63526d8ff4063785e8