diff --git a/Makefile b/Makefile
index 40b348506..80936929c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2024.6.4
+ESPHOME_REF = 2024.6.5
 PAGEFIND_VERSION=1.1.0
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind
diff --git a/changelog/2024.6.0.rst b/changelog/2024.6.0.rst
index 39d085637..2d6f3ec7a 100644
--- a/changelog/2024.6.0.rst
+++ b/changelog/2024.6.0.rst
@@ -219,6 +219,13 @@ Release 2024.6.4 - June 27
 - [ota-esphome] Merge configurations by port :esphomepr:`7001` by :ghuser:`kbx81`
 - Fix LEDC 100% is not 100% duty with ESP32 IDF :esphomepr:`6997` by :ghuser:`Links2004`
 
+Release 2024.6.5 - July 3
+-------------------------
+
+- [mpr121] await register parented :esphomepr:`7014` by :ghuser:`jesserockz`
+- Move some consts for #4585 :esphomepr:`7023` by :ghuser:`kbx81`
+- [wifi] Only set default ttls phase 2 on esp-idf :esphomepr:`7033` by :ghuser:`jesserockz`
+
 Full list of changes
 --------------------
 
diff --git a/components/remote_receiver.rst b/components/remote_receiver.rst
index a994d8c51..20ef6b324 100644
--- a/components/remote_receiver.rst
+++ b/components/remote_receiver.rst
@@ -23,6 +23,8 @@ which will trigger when they hear their own configured signal.
       pin: GPIOXX
       dump: all
 
+Multiple remote receivers can be configured as a list of dict definitions in remote_receiver.
+
 Configuration variables:
 ------------------------
 
@@ -234,6 +236,8 @@ Configuration variables:
 
 - **name** (**Required**, string): The name for the binary sensor.
 - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
+- **receiver_id** (*Optional*, :ref:`config-id`): The remote receiver to receive the
+  remote code with. Required if multiple receivers configured.
 - All other options from :ref:`Binary Sensor <config-binary_sensor>`.
 
 Remote code selection (exactly one of these has to be included):
diff --git a/guides/supporters.rst b/guides/supporters.rst
index 35f96e4ca..dc3a00317 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -1032,6 +1032,7 @@ Contributors
 - `Joakim Sørensen (@ludeeus) <https://github.com/ludeeus>`__
 - `ludrao (@ludrao) <https://github.com/ludrao>`__
 - `Luiz Correia (@luizcorreia) <https://github.com/luizcorreia>`__
+- `luk1803 (@luk1803) <https://github.com/luk1803>`__
 - `luka6000 (@luka6000) <https://github.com/luka6000>`__
 - `Lukas Klass (@LukasK13) <https://github.com/LukasK13>`__
 - `Lukas Lindner (@lukasl96) <https://github.com/lukasl96>`__
@@ -1244,6 +1245,7 @@ Contributors
 - `NatashaLi-ESPRESSIF (@NatashaLi-ESPRESSIF) <https://github.com/NatashaLi-ESPRESSIF>`__
 - `Nate Lust (@natelust) <https://github.com/natelust>`__
 - `Nathan Marlor (@nathanmarlor) <https://github.com/nathanmarlor>`__
+- `Andreas Fritiofson (@nattgris) <https://github.com/nattgris>`__
 - `ueno (@nayuta-ueno) <https://github.com/nayuta-ueno>`__
 - `Nazar Mokrynskyi (@nazar-pc) <https://github.com/nazar-pc>`__
 - `Bergont Nicolas (@nbergont) <https://github.com/nbergont>`__
@@ -1890,4 +1892,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated June 27, 2024.*
+*This page was last updated July 3, 2024.*