diff --git a/build.xcvb b/build.xcvb
index 3f8d65db364e49788f3644b893c9361ea12c22d3..689eec44a7c55434939a502b148029f5f42a56b3 100644
--- a/build.xcvb
+++ b/build.xcvb
@@ -5,6 +5,29 @@
   :licence "MIT" ;; MIT-style license. See asdf.lisp
   :description "ASDF"
   :long-description "Another System Definition Facility."
-  :depends-on ("asdf")
+  :build-depends-on ("/uiop")
   :supersedes-asdf ("asdf")
-  :build-image nil))
+  :build-image nil
+  :depends-on
+  ("upgrade"
+   "component"
+   "system"
+   "cache"
+   "find-system"
+   "find-component"
+   "operation"
+   "action"
+   "lisp-action"
+   "plan"
+   "operate"
+   "output-translations"
+   "source-registry"
+   "backward-internals"
+   "parse-defsystem"
+   "bundle"
+   "concatenate-source"
+   "backward-interface"
+   "package-inferred-system"
+   "interface"
+   "user"
+   "footer")))
diff --git a/uiop/build.xcvb b/uiop/build.xcvb
new file mode 100644
index 0000000000000000000000000000000000000000..6965ec1d2d0372f0fd206979b4c2fef51151e5b5
--- /dev/null
+++ b/uiop/build.xcvb
@@ -0,0 +1,23 @@
+#+xcvb
+(module
+ (:fullname "/uiop"
+  :author ("Francois-Rene Rideau and contributors")
+  :licence "MIT" ;; MIT-style license. See asdf.lisp
+  :description "UIOP"
+  :long-description "Utilities for Implementation- and OS- Portability"
+  :supersedes-asdf ("uiop")
+  :build-image nil
+  :depends-on
+  ("package"
+   "common-lisp"
+   "utility"
+   "os"
+   "pathname"
+   "filesystem"
+   "stream"
+   "image"
+   "run-program"
+   "lisp-build"
+   "configuration"
+   "backward-driver"
+   "driver")))