diff --git a/asdf.asd b/asdf.asd
index 7b609dab914fe1135b41c43981abd0badd608a61..f633d841227d88d9c7f3adc1bbfca02d6a44b274 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -74,7 +74,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.29.3" ;; to be automatically updated by make bump-version
+  :version "2.29.4" ;; to be automatically updated by make bump-version
   :depends-on ()
   #+asdf3 :encoding #+asdf3 :utf-8
   ;; For most purposes, asdf itself specially counts as a builtin system.
diff --git a/concatenate-source.lisp b/concatenate-source.lisp
index 07589f7b16287790ee7625043de4b229afacd50d..d55422316cbbdec4dc39414b537d36d81e83a4d9 100644
--- a/concatenate-source.lisp
+++ b/concatenate-source.lisp
@@ -15,9 +15,7 @@
    #:monolithic-concatenate-source-op
    #:monolithic-load-concatenated-source-op
    #:monolithic-compile-concatenated-source-op
-   #:monolithic-load-compiled-concatenated-source-op
-   #:component-concatenated-source-file
-   #:concatenated-source-file))
+   #:monolithic-load-compiled-concatenated-source-op))
 (in-package :asdf/concatenate-source)
 
 ;;;
diff --git a/find-system.lisp b/find-system.lisp
index 3e6e9ab5d0e8e00a36cfaa7f852a6fc4b18bac94..9c134063bf255f6874dacae22405047f4e72e8dc 100644
--- a/find-system.lisp
+++ b/find-system.lisp
@@ -17,7 +17,7 @@
    #:*central-registry* #:probe-asd #:sysdef-central-registry-search
    #:find-system-if-being-defined #:*systems-being-defined*
    #:contrib-sysdef-search #:sysdef-find-asdf ;; backward compatibility symbols, functions removed
-   #:system-find-preloaded-system #:register-preloaded-system #:*preloaded-systems*
+   #:sysdef-find-preloaded-system #:register-preloaded-system #:*preloaded-systems*
    #:clear-defined-systems #:*defined-systems*
    ;; defined in source-registry, but specially mentioned here:
    #:initialize-source-registry #:sysdef-source-registry-search))
diff --git a/header.lisp b/header.lisp
index bd6898ed857503598032f32917aa3ec7c834f9b7..ca7e891c309edb72d8979c624092b788542a0f89 100644
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.29.3: Another System Definition Facility.
+;;; This is ASDF 2.29.4: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/image.lisp b/image.lisp
index 6feb3abeb7bbbd9c8569d6e478db39d1b73d8574..a3d6fed9013fbce6a4c721f7aab16b040fd66754 100644
--- a/image.lisp
+++ b/image.lisp
@@ -8,7 +8,7 @@
    #:*image-dumped-p* #:raw-command-line-arguments #:*command-line-arguments*
    #:command-line-arguments #:raw-command-line-arguments #:setup-command-line-arguments
    #:*lisp-interaction*
-   #:fatal-conditions #:fatal-condition-p #:handle-fatal-condition
+   #:*fatal-conditions* #:fatal-condition-p #:handle-fatal-condition
    #:call-with-fatal-condition-handler #:with-fatal-condition-handler
    #:*image-restore-hook* #:*image-prelude* #:*image-entry-point*
    #:*image-postlude* #:*image-dump-hook*
@@ -16,7 +16,7 @@
    #:shell-boolean-exit
    #:register-image-restore-hook #:register-image-dump-hook
    #:call-image-restore-hook #:call-image-dump-hook
-   #:initialize-asdf-utilities #:restore-image #:dump-image #:create-image
+   #:restore-image #:dump-image #:create-image
 ))
 (in-package :asdf/image)
 
diff --git a/interface.lisp b/interface.lisp
index 89e76417ec1d746a7fe7f70f2492e5727ad93019..c6e60adec0d262a128ac3430eeafa33aed9cde7b 100644
--- a/interface.lisp
+++ b/interface.lisp
@@ -52,7 +52,7 @@
    #:component #:parent-component #:child-component #:system #:module
    #:file-component #:source-file #:c-source-file #:java-source-file
    #:cl-source-file #:cl-source-file.cl #:cl-source-file.lsp
-   #:static-file #:doc-file #:html-file :text-file
+   #:static-file #:doc-file #:html-file
    #:source-file-type
 
    #:component-children          ; component accessors
@@ -81,8 +81,8 @@
    #:system-source-directory
    #:system-relative-pathname
    #:system-homepage
+   #:system-mailto
    #:system-bug-tracker
-   #:system-developers-email
    #:system-long-name
    #:system-source-control
    #:map-systems
diff --git a/operate.lisp b/operate.lisp
index 89ccac3eaae7f23fb37f1f3ca9ee68a53f7fc972..d1aebdeb2d3134df5005d0bc10060419e26ca7ad 100644
--- a/operate.lisp
+++ b/operate.lisp
@@ -12,8 +12,7 @@
    #:build-system
    #:load-system #:load-systems #:compile-system #:test-system #:require-system
    #:*load-system-operation* #:module-provide-asdf
-   #:component-loaded-p #:already-loaded-systems
-   #:upgrade-asdf #:cleanup-upgraded-asdf #:*post-upgrade-hook*))
+   #:component-loaded-p #:already-loaded-systems))
 (in-package :asdf/operate)
 
 (with-upgradability ()
@@ -164,6 +163,6 @@ for how to load or compile stuff")
         (clrhash *systems-being-defined*)
         (dolist (s l) (find-system s nil)))))
 
-  (pushnew 'restart-upgraded-asdf *post-upgrade-restart-hook*))
+  (register-hook-function '*post-upgrade-restart-hook* 'restart-upgraded-asdf))
 
 
diff --git a/source-registry.lisp b/source-registry.lisp
index b58e0d33cbd51a092fe13a16ddf8f9c305f2e507..8587e31924d29792479c3955574eb092b678d4da 100644
--- a/source-registry.lisp
+++ b/source-registry.lisp
@@ -10,7 +10,7 @@
    #:invalid-source-registry
    #:source-registry #:source-registry-initialized-p
    #:initialize-source-registry #:clear-source-registry #:*source-registry*
-   #:disable-source-registry #:ensure-source-registry #:*source-registry-parameter*
+   #:ensure-source-registry #:*source-registry-parameter*
    #:*default-source-registry-exclusions* #:*source-registry-exclusions*
    #:*wild-asd* #:directory-asd-files #:register-asd-directory
    #:collect-asds-in-directory #:collect-sub*directories-asd-files
diff --git a/stream.lisp b/stream.lisp
index c7c0b0ad5a0f3a5656b41838b96f12cc2c02e935..f4cb890dcd2a80a82f59d4f800a5032f8a2f79b1 100644
--- a/stream.lisp
+++ b/stream.lisp
@@ -14,7 +14,6 @@
    #:with-input-file #:call-with-input-file
    #:finish-outputs #:format! #:safe-format!
    #:copy-stream-to-stream #:concatenate-files
-   #:copy-stream-to-stream-line-by-line
    #:slurp-stream-string #:slurp-stream-lines #:slurp-stream-line
    #:slurp-stream-forms #:slurp-stream-form
    #:read-file-string #:read-file-lines #:read-file-forms #:read-file-form #:safe-read-file-form
diff --git a/upgrade.lisp b/upgrade.lisp
index fed9735401cad762fa5739184aa6ff4ac3845337..ce8b093482501e00db97cf3c85d388da4f42d6c2 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
          ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
          ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
          ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
-         (asdf-version "2.29.3")
+         (asdf-version "2.29.4")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)
     (when (and existing-version (not (equal asdf-version existing-version)))
diff --git a/utility.lisp b/utility.lisp
index 54e474edee3fea7c87de62cf2115daba8b4d4a30..ef72a551b97d113a19546163aa6ddb4fba2e3043 100644
--- a/utility.lisp
+++ b/utility.lisp
@@ -27,7 +27,6 @@
    #:call-function #:call-functions #:register-hook-function
    #:match-condition-p #:match-any-condition-p ;; conditions
    #:call-with-muffled-conditions #:with-muffled-conditions
-   #:load-string #:load-stream
    #:lexicographic< #:lexicographic<=
    #:parse-version #:unparse-version #:version< #:version<= #:version-compatible-p)) ;; version
 (in-package :asdf/utility)
@@ -398,9 +397,6 @@ with later being determined by a lexicographical comparison of minor numbers."
 ;;; Condition control
 
 (with-upgradability ()
-  (defvar *uninteresting-conditions* nil
-    "Uninteresting conditions, as per MATCH-CONDITION-P")
-
   (defparameter +simple-condition-format-control-slot+
     #+abcl 'system::format-control
     #+allegro 'excl::format-control
@@ -437,7 +433,7 @@ or a string describing the format-control of a simple-condition."
                                       (muffle-warning c)))))
       (funcall thunk)))
 
-  (defmacro with-muffled-uninteresting-conditions ((conditions) &body body)
-    `(call-with-muffled-uninteresting-conditions #'(lambda () ,@body) ,conditions)))
+  (defmacro with-muffled-conditions ((conditions) &body body)
+    `(call-with-muffled-conditions #'(lambda () ,@body) ,conditions)))
 
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 6517476e686321bf9ee4ace1bd88619441302a65..28642f86bcfd1307e52a7112c1ac1c6ece0e29a0 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.29.3"
+"2.29.4"