diff --git a/CHANGES.md b/CHANGES.md
index f98da1bd2..28bf3acc4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,11 +13,13 @@ Note that users who upgrade the simulator across versions, or who work directly
 
 This file is a best-effort approach to solving this issue; we will do our best but can guarantee that there will be things that fall through the cracks, unfortunately. If you, as a user, can suggest improvements to this file based on your experience, please contribute a patch or drop us a note on ns-developers mailing list.
 
-Changes from ns-3.36 to ns-3.37
--------------------------------
+Changes from ns-3.36 to ns-3.36.1
+---------------------------------
 
 ### New API
 
+None.
+
 ### Changes to existing API
 
 * The PTHREAD-dependent classes (mutex, thread and condition variables) were removed and replaced with C++ STL libraries. The API of the STL libraries is very similar to the equivalent ns-3 classes. The main API differences are as follows:
@@ -25,11 +27,16 @@ Changes from ns-3.36 to ns-3.37
   * `ns-3::CriticalSection cs (m_mutex)` should be refactored to `std::unique_lock lock {m_mutex}`.
   * `ns-3::SystemThread` should be refactored to `std::thread`, which, unlike SystemThread, starts the thread immediately.
   * `ns-3::SystemCondition` should be refactored to `std::condition_variable`, which relies on a companion `std::mutex`.
+* The macro for optionally including sqlite3-dependent code has been changed from STATS_HAVE_SQLITE3 to HAVE_SQLITE3, and is now defined globally.  
 
 ### Changes to build system
 
+The build system API has not changed since ns-3.36.  Several bugs were fixed and behavioral improvements were made; see the RELEASE_NOTES for details.
+
 ### Changed behavior
 
+Apart from the bugs fixed (listed in the RELEASE_NOTES), the simulation model behavior should not have changed since ns-3.36.
+
 Changes from ns-3.35 to ns-3.36
 -------------------------------
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7ad7a06f9..4ef5b1973 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,5 @@
 ns-3 RELEASE NOTES
-===================
+==================
 
 This file contains ns-3 release notes (most recent releases first).
 
@@ -9,8 +9,18 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
-Release 3-dev
--------------
+Release 3.36.1
+--------------
+
+### Availability
+
+This release is not yet available.
+
+### Supported platforms
+
+The supported platforms are the same as for the ns-3.36 release.  Linux
+systems based on musl libc may also work with this release, although this
+has not been completely tested.
 
 ### New user-visible features
 
@@ -18,6 +28,26 @@ Release 3-dev
 
 ### Bugs fixed
 
+- Various small changes were made to suppress new g++-12 compiler warnings
+- (build) - Fixed issue in which localized changes to modules or scratch directory were causing a global reconfiguration and rebuild
+- (build) - The optimization and debug compiler flags for the 'debug' build profile were reverted to the Waf settings, to improve the debugging experience
+- (build) - .ns3rc file parsing was fixed to support multiline lists and to skip comments
+- (build) - Allow module examples in subdirectories other than 'examples'
+- (build) - Report more supported features in the configuration message
+- (build) - Fix and improve generated pkgconfig files
+- (build) - Let ns3 change the configured build profile and C++ standard
+- (energy) #658 - Update energy source after updating the current drain
+- (openflow) - Update documentation and add compilation flag required by Clang
+- (sixlowpan) #659 - Fix UDP_NHC port decompression
+- (stats) - Fix missing macro definition (STATS_HAS_SQLITE3) for sqlite3 support
+- (wifi) - Check that PHY band is allowed before setting channel
+- (wifi) - Fix computation of maximum allowed channel width
+- (wifi) - Fix VHT Operation Channel Width encoding
+- (wifi) - Always add PPDU received with unsupported modulation as interference
+- (wifi) #639 - Remove FCS before deserializing Wi-Fi frames
+- (wifi) - Do not change protection when aggregating MSDU to DL MU PPDU
+- (wifi) - IdealWifiManager was not using the appropriate default mode
+
 Release 3.36
 ------------