diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index da555ee4f..d2cdd8fe2 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -91,6 +91,8 @@ These options now defaults to =t=:
 You may want to read the docstrings of these options to understand the
 consequences of this change.
 
+Also, ~org-startup-folded~ now defaults to ~showeverything~.
+
 ** New features
 
 *** Looping agenda commands over headlines
diff --git a/lisp/org.el b/lisp/org.el
index 4478b3b1c..ef2e61916 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -928,7 +928,7 @@ equivalent option for agenda views."
   :group 'org-todo
   :group 'org-archive)
 
-(defcustom org-startup-folded t
+(defcustom org-startup-folded 'showeverything
   "Non-nil means entering Org mode will switch to OVERVIEW.
 
 This can also be configured on a per-file basis by adding one of
@@ -943,6 +943,7 @@ Set `org-agenda-inhibit-startup' to a non-nil value if you want
 to ignore this option when Org opens agenda files for the first
 time."
   :group 'org-startup
+  :package-version '(Org . "9.4")
   :type '(choice
 	  (const :tag "nofold: show all" nil)
 	  (const :tag "fold: overview" t)