diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 5251def13..0eee53e62 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -10,50 +10,6 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
 
 * Version 9.0
 
-** New functions
-
-*** ~org-next-line-empty-p~ is introduced
-It replaces the deprecated ~next~ argument to ~org-previous-line-empty-p~.
-
-** Removed functions
-
-*** ~org-image-file-name-regexp~ is deprecated
-Use ~image-file-name-regexp~ instead.
-The never-used-in-core ~extensions~ argument has been dropped.
-
-*** ~org-on-heading-p~ is deprecated
-A comment to this effect was in the source code since 7.8.03, but
-now a byte-compiler warning will be generated as well.
-
-*** Various reimplementations of cl-lib functions are deprecated
-The affected functions are:
-- ~org-count~
-- ~org-remove-if~
-- ~org-remove-if-not~
-- ~org-reduce~
-- ~org-every~
-- ~org-some~
-
-Additionally, ~org-sublist~ is deprecated in favor of ~cl-subseq~.  Note
-the differences in indexing conventions: ~org-sublist~ is 1-based and
-end-inclusive; ~cl-subseq~ is 0-based and end-exclusive.
-
-*** ~org-table-recognize-table.el~ is deprecated
-It was not called by any org code since 2010.
-
-*** ~org-table-p~ is deprecated
-Use ~org-at-table-p~ instead.
-
-*** ~org-babel-get-header~ is removed
-
-Use ~assq~ or ~org-babel--get-vars~ instead, as applicable.
-
-** Miscellaneous
-
-*** ~org-babel-check-confirm-evaluate~ is now a function instead of a macro
-The calling convention has changed.
-
-* Version 8.4
 ** New features
 *** Org linter
 ~org-lint~ can check syntax and report common issues in Org documents.
@@ -92,8 +48,11 @@ details.
 Used like org-bbdb-anniversaries, it provides a few days warning
 for upcoming anniversaries (default: 7 days).
 ** New functions
-~org-show-children~ is a faster implementation of
-~outline-show-children~.
+*** ~org-show-children~ 
+It is a faster implementation of ~outline-show-children~.
+
+*** ~org-next-line-empty-p~
+It replaces the deprecated ~next~ argument to ~org-previous-line-empty-p~.
 ** Removed functions
 *** ~org-agenda-todayp~ is deprecated.
 Use ~org-agenda-today-p~ instead.
@@ -101,6 +60,38 @@ Use ~org-agenda-today-p~ instead.
 Use ~org-remove-indentation~ instead.
 *** ~org-babel-get-header~ is removed.
 Use ~org-babel--get-vars~ or ~assq~ instead.
+
+*** ~org-image-file-name-regexp~ is deprecated
+Use ~image-file-name-regexp~ instead.
+The never-used-in-core ~extensions~ argument has been dropped.
+
+*** ~org-on-heading-p~ is deprecated
+A comment to this effect was in the source code since 7.8.03, but
+now a byte-compiler warning will be generated as well.
+
+*** Various reimplementations of cl-lib functions are deprecated
+The affected functions are:
+- ~org-count~
+- ~org-remove-if~
+- ~org-remove-if-not~
+- ~org-reduce~
+- ~org-every~
+- ~org-some~
+
+Additionally, ~org-sublist~ is deprecated in favor of ~cl-subseq~.  Note
+the differences in indexing conventions: ~org-sublist~ is 1-based and
+end-inclusive; ~cl-subseq~ is 0-based and end-exclusive.
+
+*** ~org-table-recognize-table.el~ is deprecated
+It was not called by any org code since 2010.
+
+*** ~org-table-p~ is deprecated
+Use ~org-at-table-p~ instead.
+
+*** ~org-babel-get-header~ is removed
+
+Use ~assq~ or ~org-babel--get-vars~ instead, as applicable.
+
 ** Removed options
 *** Remove ~org-list-empty-line-terminates-plain-lists~
 Two consecutive blank lines always terminate all levels of current
@@ -116,6 +107,10 @@ Org files.
 *** Function ~org-remove-indentation~ changes.
 The new algorithm doesn't remove TAB characters not used for
 indentation.
+
+*** ~org-babel-check-confirm-evaluate~ is now a function instead of a macro
+The calling convention has changed.
+
 * Version 8.3
 
 ** Incompatible changes
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 37b89f172..1d8f23ea6 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -5956,7 +5956,7 @@ end of ELEM-A."
 	  (move-overlay (car o) (- (nth 1 o) offset) (- (nth 2 o) offset))))
       (goto-char (org-element-property :end elem-B)))))
 
-;; For backward-compatibility with Org < 8.4
+;; For backward-compatibility with Org <= 8.3
 (define-obsolete-function-alias
   'org-element-remove-indentation 'org-remove-indentation "25.1")
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 3578b3648..a37de0403 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -856,7 +856,7 @@ This option can also be set with the OPTIONS keyword, e.g.,
 \"broken-links:mark\"."
   :group 'org-export-general
   :version "25.1"
-  :package-version '(Org . "8.4")
+  :package-version '(Org . "9.0")
   :type '(choice
 	  (const :tag "Ignore broken links" t)
 	  (const :tag "Mark broken links in output" mark)