diff --git a/Doxygen b/Doxygen
index 868b4e2b3..76582ee8b 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2021.10.1
+PROJECT_NUMBER         = 2021.10.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index 092c36c92..0de5c681b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2021.10.1
+ESPHOME_REF = 2021.10.2
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index 9209ddd7b..a21da9501 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2021.10.1
\ No newline at end of file
+2021.10.2
\ No newline at end of file
diff --git a/changelog/2021.10.0.rst b/changelog/2021.10.0.rst
index 3a5ad3090..7097c2979 100644
--- a/changelog/2021.10.0.rst
+++ b/changelog/2021.10.0.rst
@@ -125,6 +125,24 @@ Release 2021.10.1 - October 21
 - Fix platformio version in Dockerfile doesn't match requirements :esphomepr:`2582` by :ghuser:`OttoWinter`
 - Fix platformio_install_deps no longer installing all lib_deps :esphomepr:`2584` by :ghuser:`OttoWinter`
 
+Release 2021.10.2 - October 22
+------------------------------
+
+- Fix HeatpumpIR pin :esphomepr:`2585` by :ghuser:`OttoWinter`
+- Fix PlatformIO version for latest Arduino framework :esphomepr:`2590` by :ghuser:`oxan`
+- Fix pin/component switchup in SX1509 pin configuration :esphomepr:`2593` by :ghuser:`oxan`
+- Fix old-style `arduino_version` on ESP8266 and with magic values :esphomepr:`2591` by :ghuser:`oxan`
+- Bump esphome-dashboard from 20211021.0 to 20211021.1 :esphomepr:`2594` by :ghuser:`dependabot[bot]`
+- Fix validation of addressable light IDs :esphomepr:`2588` by :ghuser:`oxan`
+- Fix socket connection closed not detected :esphomepr:`2587` by :ghuser:`OttoWinter`
+- Bump noise-c from 0.1.3 to 0.1.4 :esphomepr:`2602` by :ghuser:`OttoWinter`
+- Add OTA upload compression for ESP8266 :esphomepr:`2601` by :ghuser:`OttoWinter`
+- Re-raise keyboardinterrupt :esphomepr:`2603` by :ghuser:`OttoWinter`
+- Add owner to all libraries used :esphomepr:`2604` by :ghuser:`OttoWinter`
+- Fix compiler warnings and update platformio line filter :esphomepr:`2607` by :ghuser:`OttoWinter`
+- Fix ESP8266 OTA compression only starting framework v2.7.0 :esphomepr:`2610` by :ghuser:`OttoWinter`
+- Bugfix tca9548a and idf refactor anh :esphomepr:`2612` by :ghuser:`andreashergert1984`
+
 Full list of changes
 --------------------
 
diff --git a/components/tca9548a.rst b/components/tca9548a.rst
index 7958f3bdd..41e88b3f3 100644
--- a/components/tca9548a.rst
+++ b/components/tca9548a.rst
@@ -10,6 +10,7 @@ The TCA9548A component allows you to use TCA9548A as a I²C multiplexer
 `AdaFruit`_) in ESPHome. It uses :ref:`I²C Bus <i2c>` for communication.
 
 Once configured, you can use any of the 8 channels (TCA9548A) as separated channels for your projects.
+Every Channel acts for all connected components as a virtual I²C Bus.
 
 
 .. figure:: images/tca9548a.jpg
@@ -27,15 +28,16 @@ Once configured, you can use any of the 8 channels (TCA9548A) as separated chann
       - address: 0x70
         id: multiplex0
         i2c_id: i2c0
-        scan: true
+        channels: 
+          - bus_id: multiplex0channel0
+            channel: 0
+          - bus_id: multiplex0channel1
+            channel: 1
 
     # Individual I2C Devices
     sensor:
       - platform: bmp280
-        multiplexer:
-          id: multiplex0
-          channel: 0
-          ...
+        i2c_id: multiplex0channel1
 
 Configuration variables:
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -44,8 +46,11 @@ Configuration variables:
 - **address** (*Optional*, int): The I²C address of the Multiplexer.
   Defaults to ``0x70``.
 - **i2c_id** (*Optional*): The I²C Bus ID
-- **scan** (*Optional*, bool): if the channel should be scanned 
   Defaults to ``false`` 
+- **channels** (*Optional*): The I²C Bus Channels
+
+  - **bus_id** (**Required**, :ref:`config-id`): The id to use for this virtual I2C Bus.
+  - **channel** (**Required**): The channel (0-7) to use for this virtual I2C Bus.
 
 See Also
 --------
diff --git a/conf.py b/conf.py
index 4f06a8b8d..2ee111a7b 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "Otto Winter"
 # The short X.Y version.
 version = "2021.10"
 # The full version, including alpha/beta/rc tags.
-release = "2021.10.1"
+release = "2021.10.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/guides/supporters.rst b/guides/supporters.rst
index 32933dcf1..bc02e754c 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -734,4 +734,4 @@ Contributors
 - `ZTX18 (@ZTX18) <https://github.com/ZTX18>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated October 21, 2021.*
+*This page was last updated October 22, 2021.*