diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 104d9ee9..586b64f4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies
         run:  sudo apt-get update && sudo apt install -y $(./scripts/list-build-dependencies.sh -p apt)
       - name: Build
-        run: ./scripts/build.sh
+        run:  ./scripts/build.sh
       - name: Summarize warnings
         run:  ./scripts/count-warnings.py build.log
 
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index c96bed5e..0b2996e6 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -12,7 +12,7 @@ jobs:
         run:  ./scripts/log-env.sh
       - run:  sudo apt update
       - name: Install packages
-        run:  sudo apt-get install libsdl1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev python3-setuptools
+        run:  sudo apt-get install autoconf-archive libsdl1.2-dev libsdl-net1.2-dev libopusfile-dev libspeexdsp-dev python3-setuptools
       - name: Install scan-build (Python version)
         run:  sudo pip3 install scan-build beautifulsoup4 html5lib
       - name: Build
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5f923104..9fc32fbb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -88,7 +88,7 @@ jobs:
       - name:  Install packages
         shell: pwsh
         run: |
-          vcpkg install libpng sdl1 sdl1-net
+          vcpkg install libpng sdl1 sdl1-net opusfile speexdsp
           vcpkg integrate install
       - name:  Build
         shell: pwsh
@@ -110,7 +110,7 @@ jobs:
       - name:  Install packages
         shell: pwsh
         run: |
-          vcpkg install libpng sdl1 sdl1-net
+          vcpkg install libpng sdl1 sdl1-net opusfile speexdsp
           vcpkg integrate install
       - name:  Build
         shell: pwsh
diff --git a/scripts/build.sh b/scripts/build.sh
index e0045115..d9ab074a 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -259,10 +259,6 @@ function tools_and_flags() {
 	if [[ "${SYSTEM}" == "macos" ]]; then
 		AR="ar"
 		RANLIB="ranlib"
-
-	# MSYS universal
-	elif [[ "${SYSTEM}" == "msys2" ]]; then
-		LIBS_ARRAY+=("-lwinmm" "-lws2_32")
 	fi
 }
 
diff --git a/scripts/list-build-dependencies.sh b/scripts/list-build-dependencies.sh
index 66d9b086..0c4e117e 100755
--- a/scripts/list-build-dependencies.sh
+++ b/scripts/list-build-dependencies.sh
@@ -105,17 +105,17 @@ function list_packages() {
 			if [[ "${COMPILER}" == "gcc" ]]; then
 				COMPILER="g++"
 			fi
-			PACKAGES=(libtool build-essential libsdl1.2-dev libsdl-net1.2-dev libopusfile-dev libspeexdsp-dev)
+			PACKAGES=(libtool build-essential autoconf-archive libsdl1.2-dev libsdl-net1.2-dev libopusfile-dev libspeexdsp-dev)
 			;;
 
 		dnf)
 			VERSION_DELIM="-"
-			PACKAGES=(libtool SDL SDL_net-devel opusfile-devel speexdsp-devel)
+			PACKAGES=(libtool autoconf-archive SDL SDL_net-devel opusfile-devel speexdsp-devel)
 			;;
 
 		pacman)
 			# Arch offers 32-bit versions of SDL and speexDSP (but not others)
-			PACKAGES=(libtool sdl_net opusfile)
+			PACKAGES=(libtool autoconf-archive sdl_net opusfile)
 			if [[ "${BITS}" == 32 ]]; then
 				PACKAGES+=(lib32-sdl lib32-speexdsp)
 			else
@@ -125,7 +125,7 @@ function list_packages() {
 
 		zypper)
 			# OpenSUSE offers 32-bit versions of SDL, SDL_net, and speexDSP (but not others)
-			PACKAGES=(devel_basis libtool opusfile)
+			PACKAGES=(devel_basis libtool autoconf-archive opusfile)
 			if [[ "${BITS}" == 32 ]]; then
 				PACKAGES+=(libSDL-devel-32bit libSDL_net-devel-32bit libspeexdsp1-32bit)
 			else
@@ -151,11 +151,11 @@ function list_packages() {
 			if [[ "${COMPILER}" == "clang" ]]; then
 				COMPILER=""
 			fi
-			PACKAGES=(coreutils autogen autoconf automake pkg-config libpng sdl sdl_net opusfile speexdsp)
+			PACKAGES=(coreutils autogen autoconf autoconf-archive automake pkg-config libpng sdl sdl_net opusfile speexdsp)
 			;;
 
 		macports)
-			PACKAGES=(coreutils autogen automake autoconf pkgconfig libpng libsdl libsdl_net opusfile speexDSP)
+			PACKAGES=(coreutils autogen automake autoconf autoconf-archive pkgconfig libpng libsdl libsdl_net opusfile speexDSP)
 			;;
 
 		msys2)
@@ -166,7 +166,7 @@ function list_packages() {
 			if [[ "${BITS}" == 32 ]]; then
 				pkg_type="i686"
 			fi
-			PACKAGES=(autogen autoconf base-devel automake-wrapper)
+			PACKAGES=(autogen autoconf autoconf-archive base-devel automake-wrapper)
 			for pkg in pkg-config libtool libpng zlib SDL SDL_net opusfile speexdsp; do
 				PACKAGES+=("mingw-w64-${pkg_type}-${pkg}")
 			done