diff --git a/.gitmodules b/.gitmodules
index 78d334ffd1..468386a3f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,24 @@
 [submodule "modules/PX4Firmware"]
 	path = modules/PX4Firmware
-	url = git://github.com/ArduPilot/PX4Firmware.git
+	url = https://github.com/ArduPilot/PX4Firmware.git
 [submodule "modules/PX4NuttX"]
 	path = modules/PX4NuttX
-	url = git://github.com/ArduPilot/PX4NuttX.git
+	url = https://github.com/ArduPilot/PX4NuttX.git
 [submodule "modules/uavcan"]
 	path = modules/uavcan
-	url = git://github.com/ArduPilot/uavcan.git
+	url = https://github.com/ArduPilot/uavcan.git
 [submodule "modules/waf"]
 	path = modules/waf
-	url = git://github.com/ArduPilot/waf.git
+	url = https://github.com/ArduPilot/waf.git
 [submodule "modules/gbenchmark"]
 	path = modules/gbenchmark
-	url = git://github.com/google/benchmark.git
+	url = https://github.com/google/benchmark.git
 [submodule "modules/mavlink"]
 	path = modules/mavlink
-	url = git://github.com/ArduPilot/mavlink
+	url = https://github.com/ArduPilot/mavlink
 [submodule "gtest"]
 	path = modules/gtest
-	url = git://github.com/ArduPilot/googletest
+	url = https://github.com/ArduPilot/googletest
 [submodule "modules/ChibiOS"]
 	path = modules/ChibiOS
-	url = git://github.com/ArduPilot/ChibiOS.git
+	url = https://github.com/ArduPilot/ChibiOS.git
diff --git a/Tools/gittools/submodule-sync.sh b/Tools/gittools/submodule-sync.sh
new file mode 100755
index 0000000000..9f90c5e886
--- /dev/null
+++ b/Tools/gittools/submodule-sync.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# this copes with moving origin remote to a new git organisation
+# we run it 3 times due to the poor handling of recursion
+git submodule update --recursive --force --init
+git submodule sync --recursive
+
+git submodule update --recursive --force --init
+git submodule sync --recursive
+
+git submodule update --recursive --force --init
+git submodule sync --recursive
diff --git a/modules/mavlink b/modules/mavlink
index 36432124a9..4678e78d42 160000
--- a/modules/mavlink
+++ b/modules/mavlink
@@ -1 +1 @@
-Subproject commit 36432124a99db4302d0518e236fae4a57499793c
+Subproject commit 4678e78d420c5633d747f4ba96bb985cd25d2cd2