diff --git a/X11-base.yaml b/X11-base.yaml
index a5417d7..2041c83 100644
--- a/X11-base.yaml
+++ b/X11-base.yaml
@@ -8,14 +8,10 @@ data:
             - MIT
     dependencies:
         buildrequires:
-            platform: master
-            autotools: master
-            perl: master
+            bootstrap: master
         requires:
             platform: master
             fonts: master
-            perl: master
-            autotools: master
     references:
         community: https://github.com/modularity-modules/X11-base
         documentation: https://github.com/modularity-modules/X11-base
@@ -110,24 +106,26 @@ data:
             libX11:
                 rationale: core component of this module.
                 ref: b6693a0e3d73012d13fb4602fafc462784da03ca
+                buildorder: -1
             libXau:
                 rationale: core component of this module.
                 ref: 7acd9c1dca3a814086898044ac226cb7bdaf4b9f
                 buildorder: -5
             libxcb:
                 rationale: core component of this module.
-                ref: b14cc088efdbcdc9c9d10248c4729b92504837d1
+                ref: da106bf879a427885c9d5ad1a0e996a5dd2b06af
                 buildorder: -4
             libXcomposite:
                 rationale: core component of this module.
                 ref: bed504bb2f3a31942e1b8c867ed8eea549078712
+                buildorder: 5
             libXdamage:
                 rationale: core component of this module.
                 ref: 01caab1c6857813174ce6248dd576cb9208c456a
             libXdmcp:
                 rationale: core component of this module.
                 ref: dc4b76496caefbd8193ae8bd110bea257820aff2
-                buildorder: -10
+                buildorder: -8
             libXext:
                 rationale: core component of this module.
                 ref: 79b649ceeca9aeb62e76d660c82b6baa6bbb6564
@@ -140,6 +138,7 @@ data:
             libXfont2:
                 rationale: core component of this module.
                 ref: 8056a79a9521ecb54ffd44cd552c083d21b9e69b
+                buildorder: 5
             libXft:
                 rationale: core component of this module.
                 ref: 8eb00995406e13fd1047ebc040179e06556af16c
@@ -173,12 +172,22 @@ data:
             libXxf86vm:
                 rationale: Generated.
                 ref: caf55eb834080e0ed060474734ca6b85b681443f
+                buildorder: 5
             mesa:
                 rationale: core component of this module.
                 ref: 674d9cd03cf606873eab84e7fdc1021f8406947d
+                buildorder: 10
+            xcb-proto:
+                rationale: build requirement for libxcb.
+                ref: f27
+                buildorder: -5
             xkeyboard-config:
                 rationale: core component of this module.
                 ref: 8a65ca25ad7ec6c1491112748a52290441f55185
+            xmlto:
+                rationale: build requirement for libXdmcp.
+                ref: f27
+                buildorder: -10
             xorg-x11-proto-devel:
                 rationale: core component of this module.
                 ref: c3322598a29db4bc5f1705658ec33c1907316784