diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1155b8a2533..b99c5f07071 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-12  Juanma Barranquero  <lekktu@gmail.com>
+
+	* frameset.el (frameset--jump-to-register): Add autoload; it could be
+	called from jump-to-register after unloading the frameset package.
+
 2014-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (set-mark): Ensure mark-active is nil if the mark is nil
diff --git a/lisp/frameset.el b/lisp/frameset.el
index ca0926ab652..6470833d825 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1236,6 +1236,7 @@ All keyword parameters default to nil."
 
 ;; Register support
 
+;;;###autoload
 (defun frameset--jump-to-register (data)
   "Restore frameset from DATA stored in register.
 Called from `jump-to-register'.  Internal use only."