diff --git a/CHANGES.rst b/CHANGES.rst
index 8cece300a4..ff8674968a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,92 @@
-4.0 (unreleased)
+4.1 (unreleased)
 ================
 
 New Features
 ------------
 
+Cubeviz
+^^^^^^^
+
+Imviz
+^^^^^
+
+Mosviz
+^^^^^^
+
+Specviz
+^^^^^^^
+
+Specviz2d
+^^^^^^^^^
+
+API Changes
+-----------
+
+Cubeviz
+^^^^^^^
+
+Imviz
+^^^^^
+
+Mosviz
+^^^^^^
+
+Specviz
+^^^^^^^
+
+Specviz2d
+^^^^^^^^^
+
+Bug Fixes
+---------
+
+Cubeviz
+^^^^^^^
+
+Imviz
+^^^^^
+
+Mosviz
+^^^^^^
+
+Specviz
+^^^^^^^
+
+Specviz2d
+^^^^^^^^^
+
+Other Changes and Additions
+---------------------------
+
+4.0.1 (unreleased)
+==================
+
+Bug Fixes
+---------
+
+Cubeviz
+^^^^^^^
+
+Imviz
+^^^^^
+
+Mosviz
+^^^^^^
+
+Specviz
+^^^^^^^
+
+Specviz2d
+^^^^^^^^^
+
+4.0 (2024-10-17)
+================
+
+New Features
+------------
+
+- Added ability to load remote data from a URI or URL. [#2875, #2923]
+
 - Added flux/surface brightness translation and surface brightness
   unit conversion in Cubeviz and Specviz. [#2781, #2940, #3088, #3111, #3113, #3129,
   #3139, #3149, #3155, #3178, #3185, #3187, #3190, #3156, #3200, #3192, #3206, #3211, #3216, #3219]
@@ -51,9 +134,6 @@ Imviz
 - Updated ``link_type`` to ``align_by`` and ``wcs_use_affine`` to ``wcs_fast_approximation`` in
   Orientation plugin API to better match UI text. [#3128]
 
-Mosviz
-^^^^^^
-
 Specviz
 ^^^^^^^
 
@@ -62,6 +142,7 @@ Specviz
 Specviz2d
 ^^^^^^^^^
 
+- Add option to use self-derived spatial profile for Horne extract in spectral extraction plugin. [#2845]
 
 API Changes
 -----------
@@ -70,6 +151,8 @@ API Changes
   ``Monochromatic`` will continue to work with a deprecation warning, but may be removed in a
   future release. [#2894]
 
+- Plugin Table components now support row selection. [#2856]
+
 Cubeviz
 ^^^^^^^
 
@@ -107,17 +190,11 @@ Imviz
 - Aperture Photometry plugin now uses TRFLSQFitter to fit radial profile because LevMarLSQFitter
   is no longer recommended by Astropy. [#3202]
 
-Mosviz
-^^^^^^
-
 Specviz
 ^^^^^^^
 
 - In the Line Analysis plugin, deprecated ``width`` was removed (use ``continuum_width``). [#2878]
 
-Specviz2d
-^^^^^^^^^
-
 Bug Fixes
 ---------
 
@@ -125,6 +202,8 @@ Bug Fixes
   world and pixel (previously containing SkyCoord and pixel location tuples, respectively) are now
   each two separate columns for world_ra/world_dec and pixel_x/pixel_y, respectively. [#3089]
 
+- Stretch histogram in zoom limits no longer attempts unnecessary updates when zoom limits are changed. [#3151]
+
 - Aperture Photometry plugin no longer allows negative counts conversion factor. [#3154]
 
 - Fixed multiple select handling for batch mode aperture photometry in Cubeviz. [#3163]
@@ -151,120 +230,21 @@ Cubeviz
 
 - No longer incorrectly swap RA and Dec axes when loading Spectrum1D objects. [#3133]
 
-Imviz
-^^^^^
-
-Mosviz
-^^^^^^
-
-Specviz
-^^^^^^^
+- Fixed fitting a model to the entire cube when NaNs are present. [#3191]
 
 Specviz2d
 ^^^^^^^^^
 
 - Fixed Subset unit when it is created in 2D spectrum viewer. [#3201]
 
+- Fix matched mouseover marker for 1d spectrum viewer when mouse is over 2d spectrum viewer. [#3203]
+
 Other Changes and Additions
 ---------------------------
 
 - Bump required specutils version to 1.16. Moment 0 calculation is now in units
   of flux*dx (rather than flux) [#3184]
 
-3.11 (unreleased)
-=================
-
-New Features
-------------
-
-- Load remote data from a URI or URL. [#2875, #2923]
-
-Cubeviz
-^^^^^^^
-
-Imviz
-^^^^^
-
-Mosviz
-^^^^^^
-
-Specviz
-^^^^^^^
-
-Specviz2d
-^^^^^^^^^
-- Add option to use self-derived spatial profile for Horne extract in spectral extraction plugin. [#2845]
-
-API Changes
------------
-
-- Plugin Table components now support row selection. [#2856]
-
-Cubeviz
-^^^^^^^
-
-Imviz
-^^^^^
-
-Mosviz
-^^^^^^
-
-Specviz
-^^^^^^^
-
-Specviz2d
-^^^^^^^^^
-
-Bug Fixes
----------
-
-Cubeviz
-^^^^^^^
-
-Imviz
-^^^^^
-
-Mosviz
-^^^^^^
-
-Specviz
-^^^^^^^
-
-Specviz2d
-^^^^^^^^^
-
-Other Changes and Additions
----------------------------
-
-- Max pinned matplotlib to <3.9 due to standalone build problems. [#2917]
-
-3.10.4 (unreleased)
-===================
-
-Bug Fixes
----------
-
-- Stretch histogram in zoom limits no longer attempts unnecessary updates when zoom limits are changed. [#3151]
-
-Cubeviz
-^^^^^^^
-
-- Fixed fitting a model to the entire cube when NaNs are present. [#3191]
-
-Imviz
-^^^^^
-
-Mosviz
-^^^^^^
-
-Specviz
-^^^^^^^
-
-Specviz2d
-^^^^^^^^^
-
-- Fix matched mouseover marker for 1d spectrum viewer when mouse is over 2d spectrum viewer. [#3203]
-
 3.10.3 (2024-07-22)
 ===================
 
diff --git a/CITATION.cff b/CITATION.cff
index 09b648771c..fa14f0fddc 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -73,9 +73,9 @@ authors:
 - family-names: "Volfman"
   given-names: "Sabrina"
 title: "Jdaviz"
-version: 3.10
+version: 4.0
 doi: https://doi.org/10.5281/zenodo.5513927
-date-released: 2024-05-03
+date-released: 2024-10-17
 url: "https://github.com/spacetelescope/jdaviz"
 
 # see a full list of contributors here: https://github.com/spacetelescope/jdaviz/graphs/contributors