diff --git a/Dockerfile.dev b/Dockerfile.dev
index 0c622f0..3e32d72 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -36,9 +36,9 @@ RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX
 COPY build-compiler-rt.sh .
 RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX
 
-# Build mingw-w64's winpthreads
-COPY build-mingw-w64-winpthreads.sh .
-RUN ./build-mingw-w64-winpthreads.sh $TOOLCHAIN_PREFIX
+# Build mingw-w64's extra libraries
+COPY build-mingw-w64-libraries.sh .
+RUN ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX
 
 # Build C test applications
 ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
diff --git a/build-all.sh b/build-all.sh
index fa4d663..c02b25a 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -12,6 +12,6 @@ PREFIX="$1"
 ./install-wrappers.sh $PREFIX
 ./build-mingw-w64.sh $PREFIX
 ./build-compiler-rt.sh $PREFIX
-./build-mingw-w64-winpthreads.sh $PREFIX
+./build-mingw-w64-libraries.sh $PREFIX
 ./build-libcxx.sh $PREFIX
 ./build-libssp.sh $PREFIX
diff --git a/build-mingw-w64-winpthreads.sh b/build-mingw-w64-libraries.sh
similarity index 82%
rename from build-mingw-w64-winpthreads.sh
rename to build-mingw-w64-libraries.sh
index 787eb12..bedad50 100755
--- a/build-mingw-w64-winpthreads.sh
+++ b/build-mingw-w64-libraries.sh
@@ -12,7 +12,9 @@ export PATH=$PREFIX/bin:$PATH
 : ${CORES:=4}
 : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
 
-cd mingw-w64/mingw-w64-libraries/winpthreads
+cd mingw-w64/mingw-w64-libraries
+for lib in winpthreads winstorecompat; do
+cd $lib
 for arch in $ARCHS; do
     mkdir -p build-$arch
     cd build-$arch
@@ -22,3 +24,5 @@ for arch in $ARCHS; do
     make install
     cd ..
 done
+cd ..
+done