diff --git a/NEWS.md b/NEWS.md
index 74b049ace5..2688855c60 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -270,8 +270,11 @@
   is setup once in total instead of once per group (@teunbrand, #5971)
 * `facet_grid(space = "free")` can now be combined with `coord_fixed()` 
   (@teunbrand, #4584).
-* `theme_classic()` now has black ticks and text instead of dark gray. In 
-  addition, `theme_classic()`'s axis line end is `"square"` (@teunbrand, #5978).
+* `theme_classic()` has the following changes (@teunbrand, #5978 & #6320):
+    * Axis ticks are now black (`ink`-coloured) instead of dark gray.
+    * Axis line ends are now `"square"`.
+    * The panel grid is now blank at the `panel.grid` hierarchy level instead of 
+    the `panel.grid.major` and `panel.grid.minor` levels.
 * {tibble} is now suggested instead of imported (@teunbrand, #5986)
 * The ellipsis argument is now checked in `fortify()`, `get_alt_text()`, 
   `labs()` and several guides (@teunbrand, #3196).
diff --git a/R/theme-defaults.R b/R/theme-defaults.R
index 7fe9742f5e..8cba921389 100644
--- a/R/theme-defaults.R
+++ b/R/theme-defaults.R
@@ -495,9 +495,8 @@ theme_classic <- function(base_size = 11, base_family = "",
   ) %+replace%
     theme(
       # no background and no grid
-      panel.border     = element_blank(),
-      panel.grid.major = element_blank(),
-      panel.grid.minor = element_blank(),
+      panel.border = element_blank(),
+      panel.grid   = element_blank(),
 
       # show axes
       axis.text  = element_text(size = rel(0.8)),