diff --git a/data/windows/build-deps.sh b/data/windows/build-deps.sh
index 186a644be..72e0d0b90 100755
--- a/data/windows/build-deps.sh
+++ b/data/windows/build-deps.sh
@@ -116,9 +116,9 @@ export WINDRES=${MINGW_PREFIX}-windres
 export PATH=/opt/mingw${ARCH}/${MINGW_PREFIX}/bin:/opt/mingw${ARCH}/bin:${PATH}
 
 if [ -z "${NOSSE}" ]; then
-export CFLAGS="-O3 -mtune=generic -msse -msse2 -mfpmath=sse -fvisibility=hidden -fdata-sections -ffunction-sections"
+export CFLAGS="-O3 -mtune=generic -msse -msse2 -mfpmath=sse -mstackrealign -fvisibility=hidden -fdata-sections -ffunction-sections"
 else
-export CFLAGS="-O2 -fvisibility=hidden -fdata-sections -ffunction-sections"
+export CFLAGS="-O2 -mstackrealign -fvisibility=hidden -fdata-sections -ffunction-sections"
 fi
 
 export CFLAGS="${CFLAGS} -DNDEBUG -DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL -I${PREFIX}/include -I/opt/mingw${ARCH}/include"
@@ -303,10 +303,7 @@ fi
 
 if [ ! -d mxml-${MXML_VERSION} ]; then
   wget -c https://github.com/michaelrsweet/mxml/releases/download/v${MXML_VERSION}/mxml-${MXML_VERSION}.tar.gz -O mxml-${MXML_VERSION}.tar.gz
-  mkdir mxml-${MXML_VERSION}
-  cd mxml-${MXML_VERSION}
-  tar -xf ../mxml-${MXML_VERSION}.tar.gz
-  cd ..
+  tar -xf mxml-${MXML_VERSION}.tar.gz
 fi
 
 if [ ! -f mxml-${MXML_VERSION}/build-done ]; then
diff --git a/data/windows/common.env b/data/windows/common.env
index 05aca5c6e..f19f97df2 100644
--- a/data/windows/common.env
+++ b/data/windows/common.env
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 PKG_CONFIG_VERSION=0.28
-LIBLO_VERSION=0.29
+LIBLO_VERSION=0.30
 ZLIB_VERSION=1.2.11
 FILE_VERSION=5.34
-LIBOGG_VERSION=1.3.3
+LIBOGG_VERSION=1.3.4
 LIBVORBIS_VERSION=1.3.6
 FLAC_VERSION=1.3.2
 LIBSNDFILE_VERSION=1.0.28
 GLIB_VERSION=2.22.5
 GLIB_MVERSION=2.22
 FLUIDSYNTH_VERSION=1.1.11
-MXML_VERSION=2.11
+MXML_VERSION=2.12
 FFTW3_VERSION=3.3.8
 QT5_VERSION=5.5.1
 QT5_MVERSION=5.5
@@ -21,5 +21,5 @@ PYLIBLO_VERSION=0.9.2
 PYQT5_VERSION=5.5.1
 CXFREEZE_VERSION=4.3.4
 
-MAKE_ARGS="-j 8"
-TARGETDIR=$HOME/builds
+MAKE_ARGS="-j 4"
+TARGETDIR=${HOME}/builds