diff --git a/asdf.asd b/asdf.asd
index 283feae68365a289de3d88dfdf439d74ade101a2..803cc5ffdac34b9d4259f89a14fe0ec320bd21d1 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -75,7 +75,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "3.1.4.24" ;; to be automatically updated by make bump-version
+  :version "3.1.4.25" ;; to be automatically updated by make bump-version
   :depends-on ()
   #+asdf3 :encoding #+asdf3 :utf-8
   :class #+asdf3.1 package-inferred-system #-asdf3.1 system
diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo
index d72ec8f599bce0a1282347105e1c4b3dad5a5f95..a064e2e957e9efae9e3961158e8047df8876d844 100644
--- a/doc/asdf.texinfo
+++ b/doc/asdf.texinfo
@@ -5249,8 +5249,12 @@ and instead you will @code{(defclass cl-source-file.lis (cl-source-file) ((type
 and use @code{:default-component-class cl-source-file.lis}
 as argument to @code{defsystem},
 as detailed in a @pxref{FAQ,How do I create a system definition where all the source files have a .cl extension?} below.
+@code{source-file-type} is deprecated.  To access a component's
+file-type, use @code{file-type}, instead.  @code{source-file-type} will
+be removed.
 
 @findex source-file-type
+@findex file-type
 
 
 @end itemize
@@ -5665,20 +5669,6 @@ you might skip package complications:
   ...)
 @end lisp
 
-It is possible to achieve the same effect
-in a way that supports both ASDF 1 and ASDF 2,
-but really, friends don't let friends use ASDF 1.
-Please upgrade to ASDF 3.
-In short, though: do same as above, but
-@emph{before} you use the class in a @code{defsystem},
-you also define the following method:
-
-@lisp
-(defmethod source-file-type ((f cl-source-file.lis) (s system))
-  (declare (ignorable f s))
-  "lis")
-@end lisp
-
 @node How do I mark a source file to be loaded only and not compiled?, How do I work with readtables?, How do I create a system definition where all the source files have a .cl extension?, Issues with using and extending ASDF to define systems
 @subsection How do I mark a source file to be loaded only and not compiled?
 
diff --git a/header.lisp b/header.lisp
index e051a519b4f23ea91edc311df9bcb04a839878d5..26c8f8e8294a8e62483780db30ef8c82c57fe733 100644
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
-;;; This is ASDF 3.1.4.24: Another System Definition Facility.
+;;; This is ASDF 3.1.4.25: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/uiop/version.lisp-expr b/uiop/version.lisp-expr
index 4bb310288528c92fd2c2bfd12f25478e2ad3d842..09397e9163285d488968ed5f25a82bb4e46703b5 100644
--- a/uiop/version.lisp-expr
+++ b/uiop/version.lisp-expr
@@ -1,2 +1,2 @@
-"3.1.4.24"
+"3.1.4.25"
 
diff --git a/upgrade.lisp b/upgrade.lisp
index b0a31888865384903442cbd7380a8f3c1234d1c6..b7a7dcfa9a1ba7549ad72896f50094be19631e59 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -67,7 +67,7 @@ previously-loaded version of ASDF."
          ;; "3.4.5.67" would be a development version in the official branch, on top 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 "3.1.4.24")
+         (asdf-version "3.1.4.25")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)
     (when (and existing-version (not (equal asdf-version existing-version)))
diff --git a/version.lisp-expr b/version.lisp-expr
index 4bb310288528c92fd2c2bfd12f25478e2ad3d842..09397e9163285d488968ed5f25a82bb4e46703b5 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1,2 +1,2 @@
-"3.1.4.24"
+"3.1.4.25"