diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 824604eec..8ff1ec721 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -157,11 +157,18 @@ if [[ ! -d libgit2 || -f build.libgit2 ]] ; then
 fi
 
 # libdivecomputer
+# ensure the git submodule is present and the autotools are set up
 
 cd "$BASEDIR"/subsurface
 if [ ! -d libdivecomputer/src ] ; then
+	git submodule init
 	git submodule update --recursive
 fi
+if [ ! -f libdivecomputer/configure ] ; then
+	cd libdivecomputer
+	autoreconf --install
+	autoreconf --install
+fi
 
 cd "$BUILDDIR"
 if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then