diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index ea251493cbbe7cb9a6df2c3d7c3a57a390b48530..6736cbdd854a75924d232e0a484599e70d5a77f1 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -5,6 +5,7 @@
 #@ load("/components/mpc.lib.yml", "mpc_component")
 #@ load("/components/mpfr.lib.yml", "mpfr_component")
 #@ load("/components/cmake.lib.yml", "cmake_component")
+#@ load("/components/zlib.lib.yml", "zlib_component")
 #@ load("/components/libunwind.lib.yml", "libunwind_component")
 #@ load("/components/llvm.lib.yml", "llvm_component")
 #@ load("/components/llvm_documentation.lib.yml", "llvm_documentation_component")
@@ -46,6 +47,7 @@ components:
   mpc: #@ mpc_component
   mpfr: #@ mpfr_component
   cmake: #@ cmake_component
+  zlib: #@ zlib_component
   libunwind: #@ libunwind_component
   llvm: #@ llvm_component
   llvm-documentation: #@ llvm_documentation_component
diff --git a/.orchestra/config/components/qemu.lib.yml b/.orchestra/config/components/qemu.lib.yml
index 63ed3768362e2b27240363a1554c326197d7ebe1..adcd27caaf7de4af1cc8dac786d8349b7f883433 100644
--- a/.orchestra/config/components/qemu.lib.yml
+++ b/.orchestra/config/components/qemu.lib.yml
@@ -40,6 +40,7 @@ builds:
       dependencies:
         - llvm
         - clang-release
+        - zlib
   #@ end
 #@ end
 
diff --git a/.orchestra/config/components/ui/qt.lib.yml b/.orchestra/config/components/ui/qt.lib.yml
index d1386dfcf1b507898f989de03cd410db214824dc..e157e83cb0f4e66f59506f1047386cdfe352de78 100644
--- a/.orchestra/config/components/ui/qt.lib.yml
+++ b/.orchestra/config/components/ui/qt.lib.yml
@@ -48,7 +48,6 @@
     -skip qtwebengine \
     -openssl-runtime \
     -no-glib \
-    -qt-zlib \
     -no-cups \
     -no-gtk \
     -qt-harfbuzz \
@@ -65,7 +64,6 @@
     -qt-libjpeg \
     -qt-sqlite \
     -qt-pcre \
-    -qt-zlib \
     -qt-doubleconversion \
     -sql-sqlite \
     -no-sql-odbc \
@@ -116,6 +114,7 @@ builds:
       - clang-release
       - toolchain/host/gcc
       - ui/mesa
+      - zlib
   #@ end
 
 #@ end
diff --git a/.orchestra/config/components/zlib.lib.yml b/.orchestra/config/components/zlib.lib.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cab4b8b6ef52b49a684cc1f56bbbf7ad54223376
--- /dev/null
+++ b/.orchestra/config/components/zlib.lib.yml
@@ -0,0 +1,25 @@
+#@ load("/lib/create_component.lib.yml", "single_build_component")
+
+#@ load("/global_options.lib.yml", "options")
+
+#@ source_url = "https://zlib.net/zlib-1.2.11.tar.gz"
+
+#@yaml/text-templated-strings
+---
+#@ def _zlib_args():
+configure: |
+  mkdir -p "$BUILD_DIR"
+  extract.sh --into "$BUILD_DIR" (@= source_url @)
+  cd "$BUILD_DIR"
+  ./configure \
+    --shared \
+    --uname=linux \
+    --prefix="$ORCHESTRA_ROOT"
+build_system: make
+dependencies:
+  - toolchain/host/gcc
+#@ end
+
+---
+
+#@ zlib_component = single_build_component(**_zlib_args())