diff --git a/ChangeLog.3 b/ChangeLog.3
index 9bf9bab1178..1c630f7fd25 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,65 @@
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Mention trace.el facilities in the ELisp manual
+
+	* doc/lispref/debugging.texi (Debugging): Mention the trace.el
+	library.
+
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of safe values of variables
+
+	* doc/lispref/variables.texi (File Local Variables): Mention the
+	autoload cookie as a means of defining safe values for variables.
+	See http://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00261.html
+	for the details.
+	* doc/lispref/compile.texi (Compiler Errors): Document
+	'byte-compile-error-on-warn'.
+
+2018-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve the Emacs manual's "Misc" node
+
+	* doc/emacs/misc.texi (Gnus): A more descriptive section name.
+	(Invoking emacsclient): Mention how to avoid errors when there's
+	no Emacs server.
+	(EWW, Embedded WebKit Widgets): Now subsections under
+	"Hyperlinking and Web Navigation Features".
+	(Amusements): Add "games" to the section name.  Suggested by Alex
+	Branham <alex.branham@gmail.com> in emacs-manual-bugs@gnu.org.
+
+	* doc/emacs/emacs.texi (Top): Adjust the top-level menus to the
+	above changes.
+
+	* doc/lispref/os.texi (Security Considerations): Fix typos.
+
+2018-01-13  Martin Rudalics  <rudalics@gmx.at>
+
+	In nsterm.m use FRAME_NS_P instead of FRAME_X_P (Bug#30019)
+
+	* src/nsterm.m (x_set_parent_frame): Call FRAME_NS_P instead
+	of FRAME_X_P (Bug#30019).
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.0.91
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version.
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+	* ChangeLog.3: Update
+
+2018-01-12  Nicolas Petton  <nicolas@petton.fr>
+
+	Update authors
+
+	* admin/authors.el (authors-aliases, authors-valid-file-names): Additions.
+	* etc/AUTHORS: Update AUTHORS file.
+
 2018-01-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* lisp/gnus/message.el (message-do-auto-fill): Prevent do-auto-fill from
@@ -56068,7 +56130,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit bce51bd6f7702dbc70a570e8b905f23db9cdcdcf (inclusive).
+commit 5dd0e5c54d29e81c07798a124295c8c3f016d621 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables: