diff --git a/TODO b/TODO
index a9025d48b82359897ada342926672046f9bd6e76..9961aa737aa8b7ddd1080596dbc40f8848ac628b 100644
--- a/TODO
+++ b/TODO
@@ -2,20 +2,9 @@
  and that breakage gets fixed quickly.
 * Test stassats's thing:
    (asdf:enable-asdf-binary-locations-compatibility :centralize-lisp-binaries t :default-toplevel-directory *fasl-dir*)
-* Split ASDF in parts
-** Have it pass test-lisp
-** Have it pass test-upgrade
-** Get package upgrade right
+* Get package upgrade right
    Try a newer CLISP than 2.44.1, and if it still breaks, try harder,
    by e.g. having ensure-package return a working defpackage form.
-** The unconditional ensure-package-unused breaks test-encodings.script,
-   since asdf severs itself from its client package hosting the
-   defsystem form during defsystem-depends-on.
-** Solution 1: emulate hook on the *upgraded-p* solution, either using
-   explicit flag, explicit version numbers or implicit version information
-   (e.g. source-code or sxhash thereof, also accounting for dependency
-   package information).
-** Solution 2: Just "do the right thing" with exported symbols.
 * Make load-op a generic operation that selects the proper strategy
   for each system, module or file, according to component properties and user-configuration:
   compile the lisp file then load the fasl (load-compiled-op),
diff --git a/asdf.asd b/asdf.asd
index b97c153c4a1370eb0e89fce51dd9de56d9178cdb..0ab8794f04830d5ca9367bf8a39780dc1299ee1b 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.124" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.125" ;; 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 asdf/defsystem))))
diff --git a/header.lisp b/header.lisp
index eac91b05c7560e62682a7872b9dd06a5573e0200..02586794224c6ccf6e01bb2df53c29ad2faab73e 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.124: Another System Definition Facility.
+;;; This is ASDF 2.26.125: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/lisp-action.lisp b/lisp-action.lisp
index cbd896ac34a4e166993b3682e2b967140b48bffd..cfc65a865022e783b459d8f44cec0169af0efa0f 100644
--- a/lisp-action.lisp
+++ b/lisp-action.lisp
@@ -117,8 +117,9 @@
       #+ecl ,@(unless (use-ecl-byte-compiler-p)
                 (compile-file-pathname i :type :object))
       #+mkcl ,(compile-file-pathname i :fasl-p nil) ;; object file
-      #+sbcl ,@(unless (builtin-system-p (component-system c))
-                 `(,(make-pathname :type "sbcl-warnings" :defaults f))))))
+      #+sbcl ,@(let ((s (component-system c)))
+                 (unless (or (builtin-system-p s) (equal (component-name s) "asdf"))
+                   `(,(make-pathname :type "sbcl-warnings" :defaults f)))))))
 (defmethod component-depends-on ((o compile-op) (c component))
   (declare (ignorable o))
   `((prepare-op ,c) ,@(call-next-method)))
diff --git a/upgrade.lisp b/upgrade.lisp
index bf16e09a2e890cf43f25b992f8ed7e9712c3db3c..f3d4ed3d163fcfd08273a2623d74a2d699162d3d 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -45,7 +45,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.124")
+         (asdf-version "2.26.125")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
diff --git a/version.lisp-expr b/version.lisp-expr
index 77a3e8e93a3f79d7e21651d964de6b864d0d0272..16fb0f044bb62a4b897351b70f63085a4af26d41 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.124"
+"2.26.125"