diff --git a/doc/whats-new.rst b/doc/whats-new.rst
index 16d2548343f..4adb30d6e53 100644
--- a/doc/whats-new.rst
+++ b/doc/whats-new.rst
@@ -15,13 +15,14 @@ What's New
     np.random.seed(123456)
 
 
-.. _whats-new.2024.05.1:
+.. _whats-new.2024.06.0:
 
-v2024.06 (unreleased)
+v2024.06.0 (unreleased)
 -----------------------
+This release brings various performance optimizations and compatibility with the upcoming numpy 2.0 release.
 
-New Features
-~~~~~~~~~~~~
+Thanks to the 22 contributors to this release:
+Alfonso Ladino, David Hoese, Deepak Cherian, Eni Awowale, Ilan Gold, Jessica Scheick, Joe Hamman, Justus Magin, Kai Mühlbauer, Mark Harfouche, Mathias Hauser, Matt Savoie, Maximilian Roos, Mike Thramann, Nicolas Karasiak, Owen Littlejohns, Paul Ockenfuß, Philippe THOMY, Scott Henderson, Spencer Clark, Stephan Hoyer and Tom Nicholas
 
 Performance
 ~~~~~~~~~~~
@@ -34,37 +35,30 @@ Performance
   By `Alfonso Ladino <https://github.com/aladinor>`_.
 
 
-Breaking changes
-~~~~~~~~~~~~~~~~
-
-
-Deprecations
-~~~~~~~~~~~~
-
-
 Bug fixes
 ~~~~~~~~~
 - Preserve conversion of timezone-aware pandas Datetime arrays to numpy object arrays
   (:issue:`9026`, :pull:`9042`).
   By `Ilan Gold <https://github.com/ilan-gold>`_.
-
 - :py:meth:`DataArrayResample.interpolate` and :py:meth:`DatasetResample.interpolate` method now
-  support aribtrary kwargs such as ``order`` for polynomial interpolation. (:issue:`8762`).
+  support arbitrary kwargs such as ``order`` for polynomial interpolation (:issue:`8762`).
   By `Nicolas Karasiak <https://github.com/nkarasiak>`_.
 
 
 Documentation
 ~~~~~~~~~~~~~
-- Add link to CF Conventions on packed data and sentence on type determination in doc/user-guide/io.rst (:issue:`9041`, :pull:`9045`).
+- Add link to CF Conventions on packed data and sentence on type determination in the I/O user guide (:issue:`9041`, :pull:`9045`).
   By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
 
 
 Internal Changes
 ~~~~~~~~~~~~~~~~
 - Migrates remainder of ``io.py`` to ``xarray/core/datatree_io.py`` and
-  ``TreeAttrAccessMixin`` into ``xarray/core/common.py`` (:pull: `9011`)
+  ``TreeAttrAccessMixin`` into ``xarray/core/common.py`` (:pull:`9011`).
   By `Owen Littlejohns <https://github.com/owenlittlejohns>`_ and
   `Tom Nicholas <https://github.com/TomNicholas>`_.
+- Compatibility with numpy 2 (:issue:`8844`, :pull:`8854`, :pull:`8946`).
+  By `Justus Magin <https://github.com/keewis>`_ and `Stephan Hoyer <https://github.com/shoyer>`_.
 
 
 .. _whats-new.2024.05.0:
@@ -123,8 +117,8 @@ Bug fixes
   <https://github.com/pandas-dev/pandas/issues/56147>`_ to
   :py:func:`pandas.date_range`, date ranges produced by
   :py:func:`xarray.cftime_range` with negative frequencies will now fall fully
-  within the bounds of the provided start and end dates (:pull:`8999`). By
-  `Spencer Clark <https://github.com/spencerkclark>`_.
+  within the bounds of the provided start and end dates (:pull:`8999`).
+  By `Spencer Clark <https://github.com/spencerkclark>`_.
 
 Internal Changes
 ~~~~~~~~~~~~~~~~
@@ -149,7 +143,8 @@ Internal Changes
 - ``transpose``, ``set_dims``, ``stack`` & ``unstack`` now use a ``dim`` kwarg
   rather than ``dims`` or ``dimensions``. This is the final change to make xarray methods
   consistent with their use of ``dim``. Using the existing kwarg will raise a
-  warning. By `Maximilian Roos <https://github.com/max-sixty>`_
+  warning.
+  By `Maximilian Roos <https://github.com/max-sixty>`_
 
 .. _whats-new.2024.03.0:
 
diff --git a/xarray/tests/__init__.py b/xarray/tests/__init__.py
index c32e03238b5..0caab6e8247 100644
--- a/xarray/tests/__init__.py
+++ b/xarray/tests/__init__.py
@@ -145,7 +145,7 @@ def _importorskip(
 )
 has_numbagg_or_bottleneck = has_numbagg or has_bottleneck
 requires_numbagg_or_bottleneck = pytest.mark.skipif(
-    not has_numbagg_or_bottleneck, reason="requires numbagg or bottlekneck"
+    not has_numbagg_or_bottleneck, reason="requires numbagg or bottleneck"
 )
 has_numpy_2, requires_numpy_2 = _importorskip("numpy", "2.0.0")