diff --git a/.github/workflows/push-production.yaml b/.github/workflows/push-production.yaml
index 023209e20e0..d937c364d2d 100644
--- a/.github/workflows/push-production.yaml
+++ b/.github/workflows/push-production.yaml
@@ -465,6 +465,10 @@ jobs:
         with:
           package-name: libretls
 
+      - uses: chainguard-dev/actions/inky-build-pkg@main
+        with:
+          package-name: util-macros
+
       - name: 'Upload the repository to a bucket'
         run: |
           cp /etc/apk/keys/wolfi-signing.rsa.pub ${{ github.workspace }}/packages/wolfi-signing.rsa.pub
diff --git a/.github/workflows/push-staging.yaml b/.github/workflows/push-staging.yaml
index 9f24c1e3d9d..26c61df715b 100644
--- a/.github/workflows/push-staging.yaml
+++ b/.github/workflows/push-staging.yaml
@@ -463,6 +463,10 @@ jobs:
         with:
           package-name: libretls
 
+      - uses: chainguard-dev/actions/inky-build-pkg@main
+        with:
+          package-name: util-macros
+
       - name: 'Upload the repository to a bucket'
         run: |
           cp /etc/apk/keys/wolfi-signing.rsa.pub ${{ github.workspace }}/packages/wolfi-signing.rsa.pub
diff --git a/Makefile b/Makefile
index 984b14441a8..0f853a76ba5 100644
--- a/Makefile
+++ b/Makefile
@@ -131,5 +131,6 @@ $(eval $(call build-package,skalibs,2.12.0.0-r0))
 $(eval $(call build-package,execline,2.9.0.1-r0))
 $(eval $(call build-package,s6,2.11.1.2-r0))
 $(eval $(call build-package,libretls,3.5.2-r0))
+$(eval $(call build-package,util-macros,1.19.3-r0))
 
 .build-packages: ${PACKAGES}
diff --git a/util-macros.yaml b/util-macros.yaml
new file mode 100644
index 00000000000..5d2f3656162
--- /dev/null
+++ b/util-macros.yaml
@@ -0,0 +1,45 @@
+package:
+  name: util-macros
+  version: 1.19.3
+  epoch: 1
+  description: "util-macros library"
+  target-architecture:
+    - all
+  copyright:
+    - paths:
+      - "*"
+      attestation: TODO
+      license: MIT
+
+environment:
+  contents:
+    repositories:
+      - https://packages.wolfi.dev/bootstrap/stage3
+    keyring:
+      - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub
+    packages:
+      - ca-certificates-bundle
+      - build-base
+      - busybox
+
+pipeline:
+  - uses: fetch
+    with:
+      uri: https://www.x.org/releases/individual/util/util-macros-${{package.version}}.tar.gz
+      expected-sha256: 624bb6c3a4613d18114a7e3849a3d70f2d7af9dc6eabeaba98060d87e3aef35b
+  - name: Configure
+    runs: |
+        ./configure \
+         --host=$(uname -m)-pc-linux-gnu \
+         --prefix=/usr
+  - uses: autoconf/make
+  - uses: autoconf/make-install
+
+subpackages:
+  - name: "util-macros-dev"
+    description: "util-macros headers"
+    pipeline:
+      - uses: split/dev
+    dependencies:
+      runtime:
+        - util-macros
\ No newline at end of file