diff --git a/_static/changelog-2022.6.0.png b/_static/changelog-2022.6.0.png
new file mode 100644
index 000000000..e612869e9
Binary files /dev/null and b/_static/changelog-2022.6.0.png differ
diff --git a/changelog/2022.6.0.rst b/changelog/2022.6.0.rst
index bd862ea8e..88cf474b0 100644
--- a/changelog/2022.6.0.rst
+++ b/changelog/2022.6.0.rst
@@ -3,7 +3,7 @@ ESPHome 2022.6.0 - 15th June 2022
 
 .. seo::
     :description: Changelog for ESPHome 2022.6.0.
-    :image: /_static/changelog-2022.5.0.png
+    :image: /_static/changelog-2022.6.0.png
     :author: Jesse Hills
     :author_twitter: @jesserockz
 
@@ -24,13 +24,15 @@ around that time. So lets hope we can make 2022.8.0 worth the wait.
 🎶🎶🎶 Media Players
 --------------------
 
-More info here...
+ESPHome can now become a media player target for Home Assistant. This allows users to buy or build
+ESP32 based speakers and place them around the house.
 
 Link to `Media Players <https://esphome.github.io/media-players>`_.
 
 Join us in a live stream all about Audio in the Open Home!
 
 When: Thursday, June 16, at 7pm UTC / 12pm PST / 9pm CET
+More info here...
 
 .. raw:: html
 
@@ -40,6 +42,7 @@ When: Thursday, June 16, at 7pm UTC / 12pm PST / 9pm CET
             allowfullscreen>
     </iframe>
 
+
 Includes with vars
 ------------------
 
@@ -78,10 +81,36 @@ Basically, they decided to upgrade the ``!include`` yaml "directive" to allow va
 Now while this is probably not the best example, the variables act as ``substitutions``
 and can be used anywhere in the underlying yaml file and can very much DRY out your configurations.
 
+Breaking Changes
+----------------
 
+TCS34725 integration time
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Flesh out breaking changes here (see list below)
+The sampling settings for the TCS34725 have had a new option ``auto`` added and set as the default. This allows for better accuracy.
+You are able to set it back to the previous default value by specifying ``integration_time: 2.4ms`` in your configuration.
 
+SGP40 moved
+^^^^^^^^^^^
+
+While adding support for the SGP41 chip, the SGP40 was moved and they were both combined into a new ``sgp4x`` component.
+
+MQTT fan speeds
+^^^^^^^^^^^^^^^
+
+:esphomepr:`3397` removes deprecated MQTT fan speed state and speed command topics.
+These were replaced with speed level state and command topics in ESPHome 2021.10.0.
+
+AC Dimmer
+^^^^^^^^^
+
+Due to an output power calculation the perceived power might vary slightly specially in the lower and upper regions.
+
+DisplayBuffer
+^^^^^^^^^^^^^
+
+A new virtual method was added to the DisplayBuffer class for specifying the display type. This change only affects ``external_components``.
+See :esphomepr:`3430` for more details.
 
 Full list of changes
 --------------------
@@ -102,11 +131,6 @@ Breaking Changes
 - Output a true RMS voltage % :esphomepr:`3494` by :ghuser:`josephdouce` (breaking-change)
 - Add display_type property to DisplayBuffer :esphomepr:`3430` by :ghuser:`guillempages` (breaking-change)
 
-Notable Changes
-^^^^^^^^^^^^^^^
-
-- Add variable substitutions for !include :esphomepr:`3510` by :ghuser:`jimtng` (notable-change)
-
 Beta Changes
 ^^^^^^^^^^^^
 
@@ -116,6 +140,11 @@ Beta Changes
 - Fix compilation with ESP32-S3 :esphomepr:`3543` by :ghuser:`misery`
 - Bm3xx: Fix typo :esphomepr:`3559` by :ghuser:`martgras`
 
+Notable Changes
+^^^^^^^^^^^^^^^
+
+- Add variable substitutions for !include :esphomepr:`3510` by :ghuser:`jimtng` (notable-change)
+
 All changes
 ^^^^^^^^^^^