diff --git a/x11/base/xcb-proto/ympbuild b/x11/base/xcb-proto/ympbuild
index 58df8d45..abece4c1 100644
--- a/x11/base/xcb-proto/ympbuild
+++ b/x11/base/xcb-proto/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='xcb-proto'
-release='1'
-version='1.14'
+release='2'
+version='1.15.2'
 url='https://xcb.freedesktop.org/'
 description='X C-language Bindings protocol headers'
 email='kurth4cker@tutanota.com'
@@ -9,8 +9,8 @@ maintainer='kurth4cker'
 license=('MIT')
 source=("https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-${version}.tar.xz")
 depends=( )
-makedepends=( )
-md5sums=('4a053ca2456007a343024a0452dbf13b')
+makedepends=(python libxml2)
+md5sums=('d2251b01927c2fbe92dc540f9536b430')
 uses=()
 arch=('x86_64')
 group=(x11.base)
diff --git a/x11/base/xorg-proto/ympbuild b/x11/base/xorgproto/ympbuild
similarity index 90%
rename from x11/base/xorg-proto/ympbuild
rename to x11/base/xorgproto/ympbuild
index 99d275c3..7cf579ae 100644
--- a/x11/base/xorg-proto/ympbuild
+++ b/x11/base/xorgproto/ympbuild
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-name='xorg-proto'
+name='xorgproto'
 release='1'
 version='2022.2'
 url='https://gitlab.freedesktop.org/xorg/proto/xorgproto'
@@ -9,13 +9,13 @@ maintainer='kurth4cker'
 license=('MIT')
 source=("https://www.x.org/releases/individual/proto/xorgproto-${version}.tar.xz")
 depends=()
-makedepends=()
+makedepends=(util-macros)
 md5sums=('3fdb11d75f7023db273f7b3e34b58338')
 uses=()
 arch=('x86_64')
 group=(x11.base)
 
-cd xorgproto-$version
+cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
@@ -31,4 +31,3 @@ build(){
 package(){
     make install -j`nproc`
 }
-
diff --git a/x11/libs/libXau/ympbuild b/x11/libs/libXau/ympbuild
index b20a7f18..a4ce974b 100644
--- a/x11/libs/libXau/ympbuild
+++ b/x11/libs/libXau/ympbuild
@@ -8,7 +8,7 @@ email='kurth4cker@tutanota.com'
 maintainer='kurth4cker'
 license=('MIT')
 source=("https://www.x.org/releases/individual/lib/libXau-${version}.tar.xz")
-depends=()
+depends=(xorgproto)
 makedepends=()
 md5sums=('d32e6e8c70dd957c9c2d654e0f8d0a15')
 uses=()
diff --git a/x11/libs/libXdmcp/ympbuild b/x11/libs/libXdmcp/ympbuild
index 6fa9bcb4..214ddd68 100644
--- a/x11/libs/libXdmcp/ympbuild
+++ b/x11/libs/libXdmcp/ympbuild
@@ -8,7 +8,7 @@ email='kurth4cker@tutanota.com'
 maintainer='kurth4cker'
 license=('MIT')
 source=("https://www.x.org/releases/individual/lib/libXdmcp-${version}.tar.xz")
-depends=(xorg-proto)
+depends=(xorgproto)
 makedepends=( )
 md5sums=('0b4056a282c1e14323d5daef8fb5345d')
 uses=()
diff --git a/x11/misc/util-macros/ympbuild b/x11/misc/util-macros/ympbuild
new file mode 100644
index 00000000..1e9bffb0
--- /dev/null
+++ b/x11/misc/util-macros/ympbuild
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+name='util-macros'
+release='1'
+version='1.19.3'
+url='https://gitlab.freedesktop.org/xorg/util/macros'
+description='X.Org autotools utility macros'
+email='kurth4cker@tutanota.com'
+maintainer='kurth4cker'
+license=('MIT')
+source=("https://www.x.org/releases/individual/util/util-macros-${version}.tar.gz")
+depends=()
+makedepends=()
+md5sums=('66cb74d4a0120a06e32c3b01c29417d8')
+arch=('x86_64')
+group=(x11.misc)
+
+cd $name-$version
+
+setup(){
+    ./configure --prefix=/usr \
+        --libdir=/usr/lib64/
+}
+
+build(){
+    make -j`nproc`
+}
+
+package(){
+    make install -j`nproc`
+}
+