diff --git a/Makefile b/Makefile
index 50017cc99c9c9e113ad16ae07109f0bdb67b279d..4cc30a7fec300fdac81986cd95ef6e0e79903552 100644
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ archive-copy: archive build/asdf.lisp
 	${MAKE} push
 	git checkout master
 
-driver_lisp := header.lisp package.lisp compatibility.lisp utility.lisp pathname.lisp stream.lisp os.lisp image.lisp run-program.lisp lisp-build.lisp driver.lisp
-asdf_lisp := upgrade.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp configuration.lisp output-translations.lisp source-registry.lisp backward-internals.lisp defsystem.lisp bundle.lisp concatenate-source.lisp backward-interface.lisp interface.lisp footer.lisp
+driver_lisp := header.lisp package.lisp compatibility.lisp utility.lisp pathname.lisp stream.lisp os.lisp image.lisp run-program.lisp lisp-build.lisp driver.lisp configuration.lisp
+asdf_lisp := upgrade.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp output-translations.lisp source-registry.lisp backward-internals.lisp defsystem.lisp bundle.lisp concatenate-source.lisp backward-interface.lisp interface.lisp footer.lisp
 
 build/asdf.lisp: $(wildcard *.lisp)
 	mkdir -p build
diff --git a/asdf-driver.asd b/asdf-driver.asd
index 5652ee2dcd22f704e2814d6678c3db83f1fe88fe..83d9c7c8cdc349d44dca4d71272e5b57dd3ee791 100644
--- a/asdf-driver.asd
+++ b/asdf-driver.asd
@@ -16,4 +16,5 @@ that you can't portably construct a complete program without using them."
    (:file "image" :depends-on ("os"))
    (:file "run-program" :depends-on ("os"))
    (:file "lisp-build" :depends-on ("image"))
-   (:file "driver" :depends-on ("lisp-build" "run-program"))))
+   (:file "driver" :depends-on ("lisp-build" "run-program"))
+   (:file "configuration" :depends-on ("os"))))
diff --git a/asdf.asd b/asdf.asd
index d10501f73a0c152615bb0ff20ea96927e47a17f3..b612f847004538e952e93b40437a47a61e479144 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -15,7 +15,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.26.79" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.80" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components ((:module "build" :components ((:file "asdf"))))
   :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf))))
diff --git a/configuration.lisp b/configuration.lisp
index 70370b783a2aaa04a4f22ba18aa5169873e1367a..4906c44566447988503b8f6b417a7fcfa1638041 100644
--- a/configuration.lisp
+++ b/configuration.lisp
@@ -3,7 +3,7 @@
 
 (asdf/package:define-package :asdf/configuration
   (:recycle :asdf/configuration :asdf)
-  (:use :common-lisp :asdf/utility :asdf/pathname :asdf/stream :asdf/os :asdf/upgrade)
+  (:use :common-lisp :asdf/utility :asdf/pathname :asdf/stream :asdf/os)
   (:export
    #:get-folder-path
    #:user-configuration-directories #:system-configuration-directories
diff --git a/generate-asdf.asd b/generate-asdf.asd
index d0522b047911c2047cbdfe078a41e47fce2c78d2..8654adc1ee44b7a98e481ee77139c53bb9e6fdb4 100644
--- a/generate-asdf.asd
+++ b/generate-asdf.asd
@@ -22,9 +22,8 @@
    (:file "lisp-action" :depends-on ("action" "lisp-build"))
    (:file "plan" :depends-on ("action"))
    (:file "operate" :depends-on ("plan"))
-   (:file "configuration")
-   (:file "output-translations" :depends-on ("configuration" "operate"))
-   (:file "source-registry" :depends-on ("configuration" "find-system"))
+   (:file "output-translations" :depends-on ("operate"))
+   (:file "source-registry" :depends-on ("find-system"))
    (:file "backward-internals" :depends-on ("action" "operate"))
    (:file "defsystem" :depends-on ("backward-internals"))
    (:file "bundle" :depends-on ("lisp-action"))
diff --git a/header.lisp b/header.lisp
index 5cbdd4e8f4060802c22cbc43bb525d188d30d8e5..4c21f0dd792c5b7907226507ecf3e071818256b2 100644
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26.79: Another System Definition Facility.
+;;; This is ASDF 2.26.80: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/upgrade.lisp b/upgrade.lisp
index 78511acb1077d2b44954857927f5666591109ef2..981a751de54fd67fa746ae77ef22e2a88b7dce73 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -31,7 +31,7 @@
          ;; "2.345.6" would be a development version in the official upstream
          ;; "2.345.0.7" would be your seventh local modification of official release 2.345
          ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.26.79")
+         (asdf-version "2.26.80")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))