diff --git a/asdf.asd b/asdf.asd
index fae5b6d3ec607df25908c5d68598f09e1436cd01..58613161ce8e8454ec807ba3c0274c887e04730e 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.3.10" ;; to be automatically updated by make bump-version
+  :version "3.1.4" ;; to be automatically updated by make bump-version
   :depends-on ()
   #+asdf3 :encoding #+asdf3 :utf-8
   :class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system)
diff --git a/debian/changelog b/debian/changelog
index 6da5ad6c2d2ef2008802c2787880532787a40663..474913264e851cecdabb31cab1a493151d106afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+cl-asdf (2:3.1.4-1) unstable; urgency=low
+
+  [ Robert P. Goldman ]
+  Bug fix release:
+  * Remove compatibility stubs for old bundle classes (not working
+    properly, anyway), these are now available in a contrib.
+  * Add INPUT-STRING function to UIOP.
+  * For developer and tester convenience, bring all the external
+    dependencies into the git repo as submodules. See target make ext
+  * Optionally speed up registry search by providing a cache for
+    the SOURCE-REGISTRY. See the cache-generating script in:
+      asdf/tools/cl-source-registry-cache.lisp
+  * Fixes to tests and documentation.
+  * Many minor bugfixes.
+
+ -- François-René Rideau <fare@tunes.org>  Thu, 09 Oct 2014 21:18:21 -0400
+
 cl-asdf (2:3.1.3-1) unstable; urgency=low
 
   Bug fix release:
@@ -10,7 +27,7 @@ cl-asdf (2:3.1.3-1) unstable; urgency=low
   * Miscellaneous bug fixes and tweaks to UIOP.
   * Documentation improvements.
 
- -- Francois-Rene Rideau <fare@tunes.org>  Thu, 24 Jul 2014 12:48:29 -0400
+ -- Francois-Rene Rideau <fare@tunes.org>  Mon, 14 Jul 2014 16:54:49 -0400
 
 cl-asdf (2:3.1.2-2) unstable; urgency=low
 
diff --git a/header.lisp b/header.lisp
index 2d7cd2bad7c8cc0cbe43c28574de2083c2466484..209c5c8dc3dc17ece4c47e9a847c6d7b68364888 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.3.10: Another System Definition Facility.
+;;; This is ASDF 3.1.4: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/test/hello-world-example.asd b/test/hello-world-example.asd
index 90aa5556dead167a3fe6377b7a968ffe85c5699d..446fa9b61a21ab402605e05046f87bd20cbaa08c 100644
--- a/test/hello-world-example.asd
+++ b/test/hello-world-example.asd
@@ -8,6 +8,7 @@
      #+mkcl
      ,@`(:prefix-lisp-object-files (,(namestring (truename (translate-logical-pathname #P"SYS:cmp.a"))))
          :extra-build-args ,(or #-windows '(:use-mkcl-shared-libraries nil))
+         :class program-system
          :epilogue-code (progn
                           (setq uiop/image:*image-dumped-p* :executable)
                           (setq uiop/image:*lisp-interaction* nil)
diff --git a/test/test-program.script b/test/test-program.script
index 2d9b7fd60e8915c52eda3e9390eff9a6e2870483..9deae7c76d61359cabc801632bb95cd8c95daac7 100644
--- a/test/test-program.script
+++ b/test/test-program.script
@@ -7,6 +7,8 @@
 
 (assert (find-system :hello-world-example))
 
+(trace run-program)
+
 #+allegro
 (defparameter *lisp*
   (let ((argv0 (parse-native-namestring (first (raw-command-line-arguments)))))
diff --git a/test/test-retry-loading-component-1.script b/test/test-retry-loading-component-1.script
index 35a8c13bad612dd156522c171d9d2a1f6c8f2a9f..63620a5fbefeff54a55288c4d184333f0e756ba7 100644
--- a/test/test-retry-loading-component-1.script
+++ b/test/test-retry-loading-component-1.script
@@ -10,7 +10,8 @@
 (handler-bind
     ((error #'(lambda (c)
                 (format t "~&Caught error ~s" c)
-		(assert (not *caught-error*) () "Déjà vu")
+                (assert (not *caught-error*) ()
+                        "The missing system component error is not fixed by the handler, as expected.")
                 (setf *caught-error* t)
                 ;; Evil side-effect: create a .asd file from .hidden file.
                 (concatenate-files (list (test-source "try-reloading-dependency.hidden"))
diff --git a/uiop/contrib/debug.lisp b/uiop/contrib/debug.lisp
index b65d00e17dd0561a52f1a673ed4ff2e15a60fe61..1cd6da295e3dd82bdaee110d77a3d613612c6f65 100644
--- a/uiop/contrib/debug.lisp
+++ b/uiop/contrib/debug.lisp
@@ -1,4 +1,4 @@
-;;;;; A few essential debugging utilities by Faré,
+;;;;; A few essential debugging utilities by fare@tunes.org,
 ;;;;; to be loaded in the *PACKAGE* that you wish to debug.
 ;;
 ;; We want debugging utilities in the _current_ package,
diff --git a/upgrade.lisp b/upgrade.lisp
index fe30d70753c00a408b24f88fbda388959ac49347..4335b73c0dae3563009ec7435d19e92693832462 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.3.10")
+         (asdf-version "3.1.4")
          (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 2b7e91e151c5c91f0f7ea45784df5fa30a0dfc37..1d9aaf8c63ab4909b748287de6cf4b224e717971 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1,2 +1,2 @@
-"3.1.3.10"
+"3.1.4"