diff --git a/extra/gtk+3/build b/extra/gtk+3/build
index 4eca099e..8898a9e7 100755
--- a/extra/gtk+3/build
+++ b/extra/gtk+3/build
@@ -21,16 +21,10 @@ meson setup \
     -Ddemos=false \
     -Dexamples=false \
     -Dtests=false \
-    -Dlibepoxy:default_library=static \
-    -Dlibepoxy:egl=yes \
-    -Dlibepoxy:tests=false \
-    -Dlibepoxy:glx=no \
-    -Dlibepoxy:x11=false \
-    --force-fallback-for=libepoxy \
     output
 
 ninja -C output
-meson install -C output --skip-subprojects
+meson install -C output
 
 # GTK+3 on Wayland requires gsettings-desktop-schemas for gsettings to work
 # correctly. Under X11 it made use of xsettings but this is no longer the case.
@@ -49,10 +43,3 @@ meson install -C output --skip-subprojects
 # We don't compile with librsvg which leads to this utility solely causing
 # compiler errors for some packages. It has no use at all.
 rm -f "$1/usr/bin/gtk-encode-symbolic-svg"
-
-# Remove libepoxy and its references from installed pkg-config files. The build
-# system should have done this for us as it is statically linked.
-for f in "$1/usr/lib/pkgconfig/"*.pc; do
-    sed 's/epoxy >= 1.4//' "$f" > _
-    mv -f _ "$f"
-done
diff --git a/extra/gtk+3/checksums b/extra/gtk+3/checksums
index 358f92ea..37ab380c 100644
--- a/extra/gtk+3/checksums
+++ b/extra/gtk+3/checksums
@@ -1,5 +1,4 @@
 dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec
-a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
 69643e9bc1a0b794b0e8eb4dad2ae141bc5860b53689e4310dc4aaea15c2a888
 893f84833bf5b87a1b2f7d0a373f16037f5e2be6b4d030d8c4b7f9ff48cc993f
 8fbb449d4396cacba8c12b3e7461e1e940af8467e421a8011b3fa0bab0564426
diff --git a/extra/gtk+3/depends b/extra/gtk+3/depends
index d6163dc2..4ccaf321 100644
--- a/extra/gtk+3/depends
+++ b/extra/gtk+3/depends
@@ -3,6 +3,7 @@ fontconfig
 freetype-harfbuzz
 gdk-pixbuf
 glib
+libepoxy
 libxkbcommon
 mesa
 meson   make
diff --git a/extra/gtk+3/sources b/extra/gtk+3/sources
index bc74f10b..2482e775 100644
--- a/extra/gtk+3/sources
+++ b/extra/gtk+3/sources
@@ -1,5 +1,4 @@
 https://download.gnome.org/sources/gtk+/MAJOR.MINOR/gtk+-VERSION.tar.xz
-https://github.com/anholt/libepoxy/archive/1.5.10.tar.gz subprojects/libepoxy
 https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/archive/42.0/gsettings-desktop-schemas-42.0.tar.gz schemas
 patches/01-no-fribidi.patch
 patches/02-fix-firefox.patch
diff --git a/extra/gtk+3/version b/extra/gtk+3/version
index 41ed21b7..43c5d077 100644
--- a/extra/gtk+3/version
+++ b/extra/gtk+3/version
@@ -1 +1 @@
-3.24.34 2
+3.24.34 3
diff --git a/extra/libepoxy/build b/extra/libepoxy/build
new file mode 100755
index 00000000..ff3c5aca
--- /dev/null
+++ b/extra/libepoxy/build
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+meson setup \
+    -Dprefix=/usr \
+    -Degl=yes \
+    -Dtests=false \
+    -Dglx=no \
+    -Dx11=false \
+    output
+
+ninja -C output
+meson install -C output
diff --git a/extra/libepoxy/checksums b/extra/libepoxy/checksums
new file mode 100644
index 00000000..80cb01e2
--- /dev/null
+++ b/extra/libepoxy/checksums
@@ -0,0 +1 @@
+a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
diff --git a/extra/libepoxy/depends b/extra/libepoxy/depends
new file mode 100644
index 00000000..e68256be
--- /dev/null
+++ b/extra/libepoxy/depends
@@ -0,0 +1,2 @@
+mesa  make
+meson make
diff --git a/extra/libepoxy/sources b/extra/libepoxy/sources
new file mode 100644
index 00000000..a14d6992
--- /dev/null
+++ b/extra/libepoxy/sources
@@ -0,0 +1 @@
+https://github.com/anholt/libepoxy/archive/VERSION.tar.gz
diff --git a/extra/libepoxy/version b/extra/libepoxy/version
new file mode 100644
index 00000000..e5b15e71
--- /dev/null
+++ b/extra/libepoxy/version
@@ -0,0 +1 @@
+1.5.10 1