diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7ba80c..c6d002b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Check out SDL sources
       run: |
-        git clone --depth 1 --branch release-2.0.14 https://github.com/libsdl-org/SDL.git /tmp/SDL
+        git clone --depth 1 https://github.com/libsdl-org/SDL.git /tmp/SDL
     - name: Build binaries
       run: |
         cd /tmp/SDL
@@ -34,7 +34,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Check out SDL sources
       run: |
-        git clone --depth 1 --branch release-2.0.14 https://github.com/libsdl-org/SDL.git /tmp/SDL
+        git clone --depth 1 https://github.com/libsdl-org/SDL.git /tmp/SDL
     - name: Build i386 binaries
       run: |
         mkdir /tmp/i386
@@ -57,4 +57,4 @@ jobs:
         body: This PR has been auto-generated to update the Linux SDL binaries.
         branch: update-linux-binaries
       env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
\ No newline at end of file
diff --git a/linux-build/Dockerfile.amd64 b/linux-build/Dockerfile.amd64
index 514b06f..2a5f124 100644
--- a/linux-build/Dockerfile.amd64
+++ b/linux-build/Dockerfile.amd64
@@ -4,16 +4,41 @@ FROM debian:jessie
 # Stretch and later.
 COPY stretch-package-pins /etc/apt/preferences.d/stretch
 
-# Packages are from https://hg.libsdl.org/SDL/file/default/docs/README-linux.md
+# Packages are from https://github.com/libsdl-org/SDL/blob/3a1317ed47698c268574e1d0018edd6485f5dbc4/.github/workflows/main.yml
 RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
     echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
     apt-get update && \
-    apt-get install -y build-essential mercurial make cmake autoconf automake \
-      libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \
-      libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \
-      libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \
-      libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
-      fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
-      libxkbcommon-dev wayland-protocols
+    apt-get install -y wayland-protocols \
+          pkg-config \
+          ninja-build \
+          libasound2-dev \
+          libdbus-1-dev \
+          libegl1-mesa-dev \
+          libgl1-mesa-dev \
+          libgles2-mesa-dev \
+          libglu1-mesa-dev \
+          libibus-1.0-dev \
+          libpulse-dev \
+          libsdl2-2.0-0 \
+          libsndio-dev \
+          libudev-dev \
+          libwayland-dev \
+          libwayland-client++0 \
+          wayland-scanner++ \
+          libwayland-cursor++0 \
+          libx11-dev \
+          libxcursor-dev \
+          libxext-dev \
+          libxi-dev \
+          libxinerama-dev \
+          libxkbcommon-dev \
+          libxrandr-dev \
+          libxss-dev \
+          libxt-dev \
+          libxv-dev \
+          libxxf86vm-dev \
+          libdrm-dev \
+          libgbm-dev\
+          libpulse-dev
 
 ENTRYPOINT ["/entry"]
diff --git a/linux-build/Dockerfile.i386 b/linux-build/Dockerfile.i386
index 625c3b4..d565868 100644
--- a/linux-build/Dockerfile.i386
+++ b/linux-build/Dockerfile.i386
@@ -8,12 +8,37 @@ COPY stretch-package-pins /etc/apt/preferences.d/stretch
 RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
     echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
     apt-get update && \
-    apt-get install -y build-essential mercurial make cmake autoconf automake \
-      libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \
-      libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \
-      libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \
-      libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
-      fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
-      libxkbcommon-dev wayland-protocols
+    apt-get install -y wayland-protocols \
+          pkg-config \
+          ninja-build \
+          libasound2-dev \
+          libdbus-1-dev \
+          libegl1-mesa-dev \
+          libgl1-mesa-dev \
+          libgles2-mesa-dev \
+          libglu1-mesa-dev \
+          libibus-1.0-dev \
+          libpulse-dev \
+          libsdl2-2.0-0 \
+          libsndio-dev \
+          libudev-dev \
+          libwayland-dev \
+          libwayland-client++0 \
+          wayland-scanner++ \
+          libwayland-cursor++0 \
+          libx11-dev \
+          libxcursor-dev \
+          libxext-dev \
+          libxi-dev \
+          libxinerama-dev \
+          libxkbcommon-dev \
+          libxrandr-dev \
+          libxss-dev \
+          libxt-dev \
+          libxv-dev \
+          libxxf86vm-dev \
+          libdrm-dev \
+          libgbm-dev\
+          libpulse-dev
 
 ENTRYPOINT ["/entry"]
diff --git a/linux-build/compile b/linux-build/compile
index ddeff2d..a6dafc5 100755
--- a/linux-build/compile
+++ b/linux-build/compile
@@ -4,8 +4,5 @@ set -euf -o pipefail
 
 cd /src
 rm -rf build
-mkdir build
-cd build
-../configure --prefix=/io
-make -j$(nproc)
-make install
+cmake -B build -GNinja
+cmake --build build/