diff --git a/.gitmodules b/.gitmodules
index 789449bca6..fc8176a6a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,30 +1,30 @@
-[submodule "aux/bro-aux"]
-	path = aux/bro-aux
-	url = git://git.bro.org/bro-aux
+[submodule "aux/zeek-aux"]
+	path = aux/zeek-aux
+	url = https://github.com/zeek/zeek-aux
 [submodule "aux/binpac"]
 	path = aux/binpac
-	url = git://git.bro.org/binpac
+	url = https://github.com/zeek/binpac
 [submodule "aux/broccoli"]
 	path = aux/broccoli
-	url = git://git.bro.org/broccoli
+	url = https://github.com/zeek/broccoli
 [submodule "aux/broctl"]
 	path = aux/broctl
-	url = git://git.bro.org/broctl
+	url = https://github.com/zeek/broctl
 [submodule "aux/btest"]
 	path = aux/btest
-	url = git://git.bro.org/btest
+	url = https://github.com/zeek/btest
 [submodule "cmake"]
 	path = cmake
-	url = git://git.bro.org/cmake
+	url = https://github.com/zeek/cmake
 [submodule "src/3rdparty"]
 	path = src/3rdparty
-	url = git://git.bro.org/bro-3rdparty
+	url = https://github.com/zeek/zeek-3rdparty
 [submodule "aux/broker"]
 	path = aux/broker
-	url = git://git.bro.org/broker
+	url = https://github.com/zeek/broker
 [submodule "aux/netcontrol-connectors"]
 	path = aux/netcontrol-connectors
-	url = git://git.bro.org/bro-netcontrol
+	url = https://github.com/zeek/zeek-netcontrol
 [submodule "aux/bifcl"]
 	path = aux/bifcl
-	url = git://git.bro.org/bifcl
+	url = https://github.com/zeek/bifcl
diff --git a/aux/bifcl b/aux/bifcl
index 923b7034a0..eeeeba5c93 160000
--- a/aux/bifcl
+++ b/aux/bifcl
@@ -1 +1 @@
-Subproject commit 923b7034a0b1298a47b467f78709741ac3cb4fef
+Subproject commit eeeeba5c936d7af5bba006c02d26f32457da5146
diff --git a/aux/binpac b/aux/binpac
index 2e56437cde..2c1f0d88c8 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 2e56437cdee7ab6d80a8c7acdf5fbe16ff04e7c9
+Subproject commit 2c1f0d88c889690f840d6918cebcc3f51d9b7108
diff --git a/aux/bro-aux b/aux/bro-aux
deleted file mode 160000
index 8a57979457..0000000000
--- a/aux/bro-aux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a57979457db66957163cf0c15f0c9f1d273c52e
diff --git a/aux/bro-aux b/aux/bro-aux
new file mode 120000
index 0000000000..b28967a8e2
--- /dev/null
+++ b/aux/bro-aux
@@ -0,0 +1 @@
+zeek-aux
\ No newline at end of file
diff --git a/aux/broccoli b/aux/broccoli
index 30a399a75d..d6a6f5e5d9 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 30a399a75d4863a621b8f7208198e1794a0fb281
+Subproject commit d6a6f5e5d90f3f89552b0cd8e2ef25b007a36f3b
diff --git a/aux/broctl b/aux/broctl
index fd7427c07f..e0ae3fcb54 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit fd7427c07fde598509e2035e353f145a6f7378cd
+Subproject commit e0ae3fcb549ed7875e15a655f6b8c50853260b3f
diff --git a/aux/broker b/aux/broker
index f5af210b8c..0e7218b4ab 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit f5af210b8c3192d0372401e86bcaacea0332638d
+Subproject commit 0e7218b4abd98530fbea54d546f7bf99535e2127
diff --git a/aux/zeek-aux b/aux/zeek-aux
new file mode 160000
index 0000000000..cf569fed9d
--- /dev/null
+++ b/aux/zeek-aux
@@ -0,0 +1 @@
+Subproject commit cf569fed9d450129b3fb241b9a42148fb22012e2
diff --git a/src/3rdparty b/src/3rdparty
index 1594233572..6f401c040b 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 159423357282935f72060bd3a2780501cba7dd9a
+Subproject commit 6f401c040b92f2d4ba41ad2c68e821d198c0d74f